diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2016-06-14 15:16:35 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2016-06-14 15:16:35 +0000 |
| commit | b1a523fa685e9aa015c3e0e7cea8c2698c98d6c0 (patch) | |
| tree | db9bdff2035162b9fad01c31b0aae50b0bd894bd /llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp | |
| parent | f6f149da29d9d4553901f4d24201d125cabfd4e9 (diff) | |
| download | bcm5719-llvm-b1a523fa685e9aa015c3e0e7cea8c2698c98d6c0.tar.gz bcm5719-llvm-b1a523fa685e9aa015c3e0e7cea8c2698c98d6c0.zip | |
Revert "AMDGPU/SI: Refactor fixup handling for constant addrspace variables"
This reverts commit r272675.
llvm-svn: 272677
Diffstat (limited to 'llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp index 52787b64f7e..533a54c1a8b 100644 --- a/llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp +++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp @@ -248,13 +248,14 @@ uint64_t SIMCCodeEmitter::getMachineOpValue(const MCInst &MI, return MRI.getEncodingValue(MO.getReg()); if (MO.isExpr()) { - const MCSymbolRefExpr *Expr = dyn_cast<MCSymbolRefExpr>(MO.getExpr()); + const MCSymbolRefExpr *Expr = cast<MCSymbolRefExpr>(MO.getExpr()); + const MCSymbol &Sym = Expr->getSymbol(); MCFixupKind Kind; - if (Expr && Expr->getSymbol().isExternal()) + if (Sym.isExternal()) Kind = FK_Data_4; else - Kind = FK_PCRel_4; - Fixups.push_back(MCFixup::create(4, MO.getExpr(), Kind, MI.getLoc())); + Kind = (MCFixupKind)AMDGPU::fixup_si_rodata; + Fixups.push_back(MCFixup::create(4, Expr, Kind, MI.getLoc())); } // Figure out the operand number, needed for isSrcOperand check |
