[lld] r284662 - Read an expression in the form of "ABSOLUTE(<expr>) op <expr> ...".

[Rui Ueyama via llvm-commits]

Author: ruiu
Date: Wed Oct 19 18:11:21 2016
New Revision: 284662

URL: http://llvm.org/viewvc/llvm-project?rev=284662&view=rev
Log:
Read an expression in the form of "ABSOLUTE(<expr>) op <expr> ...".

Fixes bug 30741.

Added:
    lld/trunk/test/ELF/linkerscript/absolute.s
Modified:
    lld/trunk/ELF/LinkerScript.cpp

Modified: lld/trunk/ELF/LinkerScript.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=284662&r1=284661&r2=284662&view=diff
==============================================================================
--- lld/trunk/ELF/LinkerScript.cpp (original)
+++ lld/trunk/ELF/LinkerScript.cpp Wed Oct 19 18:11:21 2016
@@ -1432,7 +1432,9 @@ SymbolAssignment *ScriptParser::readAssi
   Expr E;
   assert(Op == "=" || Op == "+=");
   if (consume("ABSOLUTE")) {
-    E = readParenExpr();
+    // The RHS may be something like "ABSOLUTE(.) & 0xff".
+    // Call readExpr1 to read the whole expression.
+    E = readExpr1(readParenExpr(), 0);
     IsAbsolute = true;
   } else {
     E = readExpr();

Added: lld/trunk/test/ELF/linkerscript/absolute.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/absolute.s?rev=284662&view=auto
==============================================================================
--- lld/trunk/test/ELF/linkerscript/absolute.s (added)
+++ lld/trunk/test/ELF/linkerscript/absolute.s Wed Oct 19 18:11:21 2016
@@ -0,0 +1,18 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: echo "SECTIONS { foo = ABSOLUTE(.) + 1; };" > %t.script
+# RUN: ld.lld -o %t --script %t.script %t.o
+# RUN: llvm-readobj --symbols %t | FileCheck %s
+
+# CHECK:        Name: foo
+# CHECK-NEXT:   Value:
+# CHECK-NEXT:   Size:
+# CHECK-NEXT:   Binding:
+# CHECK-NEXT:   Type:
+# CHECK-NEXT:   Other:
+# CHECK-NEXT:   Section: Absolute
+# CHECK-NEXT: }
+
+.text
+.globl _start
+_start: