Iasm and obj lowering for advanced switch lowering.
Jump table emission is delayed until offsets are known. X86 local jumps can be
near or far. Sanboxing is applied to indirect jumps from jump table.
BUG=
R=stichnot@chromium.org, jvoung
Review URL: https://codereview.chromium.org/1257283004.
diff --git a/src/IceSwitchLowering.cpp b/src/IceSwitchLowering.cpp
index 37e67c1..53f7890 100644
--- a/src/IceSwitchLowering.cpp
+++ b/src/IceSwitchLowering.cpp
@@ -14,6 +14,7 @@
//===----------------------------------------------------------------------===//
#include "IceSwitchLowering.h"
+#include "IceCfgNode.h"
#include "IceTargetLowering.h"
#include <algorithm>
@@ -79,9 +80,11 @@
// Case.High could be UINT64_MAX which makes the loop awkward. Unwrap the
// last iteration to avoid wrap around problems.
for (uint64_t I = Case.Low; I < Case.High; ++I)
- JumpTable->addTarget(I - MinValue, Case.Label);
- JumpTable->addTarget(Case.High - MinValue, Case.Label);
+ JumpTable->addTarget(I - MinValue, Case.Target);
+ JumpTable->addTarget(Case.High - MinValue, Case.Target);
+ Case.Target->setNeedsAlignment();
}
+ Func->addJumpTable(JumpTable);
CaseClusters.clear();
CaseClusters.emplace_back(MinValue, MaxValue, JumpTable);
@@ -91,7 +94,7 @@
bool CaseCluster::tryAppend(const CaseCluster &New) {
// Can only append ranges with the same target and are adjacent
- bool CanAppend = this->Label == New.Label && this->High + 1 == New.Low;
+ bool CanAppend = this->Target == New.Target && this->High + 1 == New.Low;
if (CanAppend)
this->High = New.High;
return CanAppend;
