summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-10-25 20:18:53 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-10-25 20:18:53 +0000
commit7484d2cbec831358526700ab6c344d0dfb086614 (patch)
tree0c0363891ce3284bc06eaf09131ba4cc81457d8a
parent95db1cc022f7a44b8a0161c2286e8f31a8355b3a (diff)
downloadbcm5719-llvm-7484d2cbec831358526700ab6c344d0dfb086614.tar.gz
bcm5719-llvm-7484d2cbec831358526700ab6c344d0dfb086614.zip
MC/AsmLexer: Fix bug in source location for Slash token.
llvm-svn: 117298
-rw-r--r--llvm/lib/MC/MCParser/AsmLexer.cpp2
-rw-r--r--llvm/test/MC/AsmParser/exprs.s5
2 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/MC/MCParser/AsmLexer.cpp b/llvm/lib/MC/MCParser/AsmLexer.cpp
index 7ca1cccc98c..867cb208cec 100644
--- a/llvm/lib/MC/MCParser/AsmLexer.cpp
+++ b/llvm/lib/MC/MCParser/AsmLexer.cpp
@@ -119,7 +119,7 @@ AsmToken AsmLexer::LexSlash() {
switch (*CurPtr) {
case '*': break; // C style comment.
case '/': return ++CurPtr, LexLineComment();
- default: return AsmToken(AsmToken::Slash, StringRef(CurPtr, 1));
+ default: return AsmToken(AsmToken::Slash, StringRef(CurPtr-1, 1));
}
// C Style comment.
diff --git a/llvm/test/MC/AsmParser/exprs.s b/llvm/test/MC/AsmParser/exprs.s
index 4e514032b6c..1cc96a3f418 100644
--- a/llvm/test/MC/AsmParser/exprs.s
+++ b/llvm/test/MC/AsmParser/exprs.s
@@ -19,9 +19,8 @@ k:
check_expr +1, 1
check_expr 1 + 2, 3
check_expr 1 & 3, 1
- // FIXME: There is a bug here in macro expansion.
- .byte 4 / 2
- .byte 4 / -2
+ check_expr 4 / 2, 2
+ check_expr 4 / -2, -2
check_expr 1 == 1, 1
check_expr 1 == 0, 0
check_expr 1 > 0, 1
OpenPOWER on IntegriCloud