llvm-mc: Symbols in a relocatable expression of the (a - b + cst) form are

allowed to be undefined when the expression is seen, we cannot enforce the
same-section requirement until the entire assembly file has been seen.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74565 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/MC/MCValue.h b/include/llvm/MC/MCValue.h
index df834c7de52a7977eff4aaf8d31bcd03b855f5fc..174992ebe0ff7b8a8e8758b7892d81188a45bc52 100644 (file)
--- a/include/llvm/MC/MCValue.h
+++ b/include/llvm/MC/MCValue.h
@@ -26,7 +26,8 @@ class MCSymbol;
 /// relocations of this general form, but we need to represent this anyway.
 ///
 /// In the general form, SymbolB can only be defined if SymbolA is, and both
-/// must be in the same (non-external) section.
+/// must be in the same (non-external) section. The latter constraint is not
+/// enforced, since a symbol's section may not be known at construction.
 ///
 /// Note that this class must remain a simple POD value class, because we need
 /// it to live in unions etc.
@@ -52,9 +53,7 @@ public:
 
   static MCValue get(MCSymbol *SymA, MCSymbol *SymB = 0, int64_t Val = 0) {
     MCValue R;
-    assert((!SymB || (SymA && SymA->getSection() && 
-                      SymA->getSection() == SymB->getSection())) &&
-           "Invalid relocatable MCValue!");
+    assert((!SymB || SymA) && "Invalid relocatable MCValue!");
     R.Cst = Val;
     R.SymA = SymA;
     R.SymB = SymB;

diff --git a/test/MC/AsmParser/exprs.s b/test/MC/AsmParser/exprs.s
index 14bafd5e28a831bf47d4c3da66c40274b877a279..20de3a5e0ba8041081985aab18483ac64539c3c2 100644 (file)
--- a/test/MC/AsmParser/exprs.s
+++ b/test/MC/AsmParser/exprs.s
@@ -52,4 +52,11 @@ k:
         i = (j + 10) - (k + 2)
         .long i
         
+        l = m - n + 4
+        
+        .text
+m:
+n:
+        nop
+        
         
\ No newline at end of file

diff --git a/tools/llvm-mc/AsmExpr.cpp b/tools/llvm-mc/AsmExpr.cpp
index 3c19be308b60fad43f8b8fc87180702ed91d96bf..4b32b922935b260ba2d2d94ee5ed285c14535d44 100644 (file)
--- a/tools/llvm-mc/AsmExpr.cpp
+++ b/tools/llvm-mc/AsmExpr.cpp
@@ -37,12 +37,11 @@ static bool EvaluateSymbolicAdd(const MCValue &LHS, MCSymbol *RHS_A,
   MCSymbol *A = LHS.getSymA() ? LHS.getSymA() : RHS_A;
   MCSymbol *B = LHS.getSymB() ? LHS.getSymB() : RHS_B;
   if (B) {
-    // If we have a negated symbol, then we must have also have a
-    // non-negated symbol, and both symbols must be in the same
-    // non-external section. We can do this check later to permit
-    // expressions which eventually fold to a representable form -- such
+    // If we have a negated symbol, then we must have also have a non-negated
+    // symbol in order to encode the expression. We can do this check later to
+    // permit expressions which eventually fold to a representable form -- such
     // as (a + (0 - b)) -- if necessary.
-    if (!A || !A->getSection() || A->getSection() != B->getSection())
+    if (!A)
       return false;
   }
   Res = MCValue::get(A, B, LHS.getConstant() + RHS_Cst);