Recommitted r267132 "[ELF] - implemented ternary operator for linkerscript expressions"
With fix: removed redundant Dot parameter.
Original commit message:
[ELF] - implemented ternary operator for linkerscript expressions
Patch implements ternary operator for linkerscript expressions.
Like:
SECTIONS {
. = 0x1 ? 0x2 : 0x3;
...
}
Differential revision: http://reviews.llvm.org/D19332
llvm-svn: 267140
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 9fcb2f61..77ba023 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -97,6 +97,17 @@
return getInteger(Tok);
}
+template <class ELFT>
+uint64_t LinkerScript<ELFT>::parseTernary(ArrayRef<StringRef> &Tokens,
+ uint64_t Cond) {
+ next(Tokens);
+ uint64_t V = parseExpr(Tokens);
+ if (!expect(Tokens, ":"))
+ return 0;
+ uint64_t W = parseExpr(Tokens);
+ return Cond ? V : W;
+}
+
static uint64_t apply(StringRef Op, uint64_t L, uint64_t R) {
if (Op == "+")
return L + R;
@@ -126,6 +137,9 @@
while (!Tokens.empty()) {
// Read an operator and an expression.
StringRef Op1 = Tokens.front();
+ if (Op1 == "?")
+ return parseTernary(Tokens, Lhs);
+
if (precedence(Op1) < MinPrec)
return Lhs;
next(Tokens);