From b27a41b44092c0a6e439203586cc944187de3388 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 11 Aug 2009 17:47:52 +0000 Subject: [PATCH] llvm-mc: Fix a crash on invalid due to a typo in relocatable expression evaluation. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78692 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/MC/AsmParser/exprs-invalid.s | 8 ++++++++ tools/llvm-mc/AsmExpr.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 test/MC/AsmParser/exprs-invalid.s diff --git a/test/MC/AsmParser/exprs-invalid.s b/test/MC/AsmParser/exprs-invalid.s new file mode 100644 index 00000000000..4accc39087c --- /dev/null +++ b/test/MC/AsmParser/exprs-invalid.s @@ -0,0 +1,8 @@ +// RUN: not llvm-mc -triple i386-unknown-unknown %s 2> %t +// RUN: FileCheck -input-file %t %s + + .text +a: + .data +// CHECK: expected relocatable expression + .long -(0 + a) diff --git a/tools/llvm-mc/AsmExpr.cpp b/tools/llvm-mc/AsmExpr.cpp index c3362e4268c..fbb0c53b1cf 100644 --- a/tools/llvm-mc/AsmExpr.cpp +++ b/tools/llvm-mc/AsmExpr.cpp @@ -81,7 +81,7 @@ bool AsmExpr::EvaluateAsRelocatable(MCContext &Ctx, MCValue &Res) const { break; case AsmUnaryExpr::Minus: /// -(a - b + const) ==> (b - a - const) - if (Value.getSymA() && !Value.getSymA()) + if (Value.getSymA() && !Value.getSymB()) return false; Res = MCValue::get(Value.getSymB(), Value.getSymA(), -Value.getConstant()); -- 2.34.1