Index: src/IceTargetLoweringX8632.cpp |
diff --git a/src/IceTargetLoweringX8632.cpp b/src/IceTargetLoweringX8632.cpp |
index 2a29fe423a7a952b86d42d85c4c3e90fee602b9e..be26073c023b1bd8f69aa9679a51e760ae6bc3ce 100644 |
--- a/src/IceTargetLoweringX8632.cpp |
+++ b/src/IceTargetLoweringX8632.cpp |
@@ -111,15 +111,15 @@ const uint32_t TargetX8632Traits::X86_STACK_ALIGNMENT_BYTES = 16; |
const char *TargetX8632Traits::TargetName = "X8632"; |
template <> |
-std::array<llvm::SmallBitVector, RCX86_NUM> |
+std::array<SmallBitVector, RCX86_NUM> |
TargetX86Base<X8632::Traits>::TypeToRegisterSet = {{}}; |
template <> |
-std::array<llvm::SmallBitVector, RCX86_NUM> |
+std::array<SmallBitVector, RCX86_NUM> |
TargetX86Base<X8632::Traits>::TypeToRegisterSetUnfiltered = {{}}; |
template <> |
-std::array<llvm::SmallBitVector, |
+std::array<SmallBitVector, |
TargetX86Base<X8632::Traits>::Traits::RegisterSet::Reg_NUM> |
TargetX86Base<X8632::Traits>::RegisterAliases = {{}}; |
@@ -250,10 +250,10 @@ void TargetX8632::emitGetIP(CfgNode *Node) { |
auto *AfterAdd = InstX86Label::create(Func, this); |
AfterAdd->setRelocOffset(AfterAddReloc); |
- auto *ImmSize = RelocOffset::create(Ctx, -typeWidthInBytes(IceType_i32)); |
+ const RelocOffsetT ImmSize = -typeWidthInBytes(IceType_i32); |
auto *GotFromPc = llvm::cast<ConstantRelocatable>( |
- Ctx->getConstantSym({AfterAddReloc, BeforeAddReloc, ImmSize}, |
+ Ctx->getConstantSym(ImmSize, {AfterAddReloc, BeforeAddReloc}, |
GlobalOffsetTable, GlobalOffsetTable, true)); |
// Insert a new version of InstX86GetIP. |