Revert expression decoding in next_pc

Author: eymay

llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp

@@ -354,41 +354,21 @@ class RuntimeDyldCheckerExprEval {
           EvalResult(("Cannot decode unknown symbol '" + Symbol + "'").str()),
           "");
 
-    // if there is an offset number expr
-    int64_t SymbolOffset = 0;
-    BinOpToken BinOp;
-    std::tie(BinOp, RemainingExpr) = parseBinOpToken(RemainingExpr);
-    switch (BinOp) {
-    case BinOpToken::Add: {
-      EvalResult Number;
-      std::tie(Number, RemainingExpr) = evalNumberExpr(RemainingExpr);
-      SymbolOffset = Number.getValue();
-      break;
-    }
-    case BinOpToken::Invalid:
-      break;
-    default:
-      return std::make_pair(
-          unexpectedToken(RemainingExpr, RemainingExpr,
-                          "expected '+' for offset or ')' if no offset"),
-          "");
-    }
-
     if (!RemainingExpr.starts_with(")"))
       return std::make_pair(
           unexpectedToken(RemainingExpr, RemainingExpr, "expected ')'"), "");
     RemainingExpr = RemainingExpr.substr(1).ltrim();
 
     MCInst Inst;
     uint64_t InstSize;
-    if (!decodeInst(Symbol, Inst, InstSize, SymbolOffset))
+    if (!decodeInst(Symbol, Inst, InstSize, 0))
       return std::make_pair(
           EvalResult(("Couldn't decode instruction at '" + Symbol + "'").str()),
           "");
 
-    uint64_t SymbolAddr =
-        PCtx.IsInsideLoad ? Checker.getSymbolLocalAddr(Symbol)
-                          : Checker.getSymbolRemoteAddr(Symbol) + SymbolOffset;
+    uint64_t SymbolAddr = PCtx.IsInsideLoad
+                              ? Checker.getSymbolLocalAddr(Symbol)
+                              : Checker.getSymbolRemoteAddr(Symbol);
 
     // ARM mode adds an offset of 4 bytes to PC
     auto TT = Checker.getTripleForSymbol(Checker.getTargetFlag(Symbol));

llvm/test/ExecutionEngine/JITLink/AArch32/ELF_relocations_arm.s

@@ -29,7 +29,7 @@
 # CHECK-INSTR: 	0000000c <call_target_arm>
 # CHECK-INSTR: 	00000010 <call_target_thumb>
 # jitlink-check: decode_operand(call_site + 0, 0) = call_target_arm   - next_pc(call_site)
-# jitlink-check: decode_operand(call_site + 4, 0) = call_target_thumb - next_pc(call_site + 4)
+# jitlink-check: decode_operand(call_site + 4, 0) = call_target_thumb - (call_site + 12)
 	.globl	call_site
 	.type	call_site,%function
 	.p2align	2