Skip to content

[ARM] Error on invalid tokens in barrier insts #118849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5129,7 +5129,8 @@ ParseStatus ARMAsmParser::parseMemBarrierOptOperand(OperandVector &Operands) {

Opt = ARM_MB::RESERVED_0 + Val;
} else
return ParseStatus::Failure;
return Error(Parser.getTok().getLoc(),
"expected an immediate or barrier type");

Operands.push_back(
ARMOperand::CreateMemBarrierOpt((ARM_MB::MemBOpt)Opt, S, *this));
Expand Down Expand Up @@ -5193,7 +5194,8 @@ ARMAsmParser::parseInstSyncBarrierOptOperand(OperandVector &Operands) {

Opt = ARM_ISB::RESERVED_0 + Val;
} else
return ParseStatus::Failure;
return Error(Parser.getTok().getLoc(),
"expected an immediate or barrier type");

Operands.push_back(ARMOperand::CreateInstSyncBarrierOpt(
(ARM_ISB::InstSyncBOpt)Opt, S, *this));
Expand Down
38 changes: 30 additions & 8 deletions llvm/test/MC/ARM/invalid-barrier.s
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,46 @@
@ DMB
@------------------------------------------------------------------------------
dmb #0x10
@ CHECK: [[@LINE-1]]:{{.*}}: error: immediate value out of range
dmb imaginary_scope

@ CHECK: error: immediate value out of range
@ CHECK: error: invalid operand for instruction
@ CHECK: [[@LINE-1]]:{{.*}}: error: invalid operand for instruction
dmb [r0]
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
dmb [], @, -=_+
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
dmb ,,,,,
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
dmb 3.141
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type

@------------------------------------------------------------------------------
@ DSB
@------------------------------------------------------------------------------
dsb #0x10
@ CHECK: [[@LINE-1]]:{{.*}}: error: immediate value out of range
dsb imaginary_scope
@ CHECK: error: immediate value out of range
@ CHECK: error: invalid operand for instruction
@ CHECK: [[@LINE-1]]:{{.*}}: error: invalid operand for instruction
dsb [r0]
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
dsb [], @, -=_+
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
dsb ,,,,,
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
dsb 3.141
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type

@------------------------------------------------------------------------------
@ ISB
@------------------------------------------------------------------------------
isb #0x1f
@ CHECK: [[@LINE-1]]:{{.*}}: error: immediate value out of range
isb imaginary_domain

@ CHECK: error: immediate value out of range
@ CHECK: error: invalid operand for instruction
@ CHECK: [[@LINE-1]]:{{.*}}: error: invalid operand for instruction
isb [r0]
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
isb [], @, -=_+
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
isb ,,,,,
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
isb 3.141
@ CHECK: [[@LINE-1]]:{{.*}}: error: expected an immediate or barrier type
Loading