diff options
| author | Vasileios Kalintiris <Vasileios.Kalintiris@imgtec.com> | 2015-10-26 14:24:30 +0000 |
|---|---|---|
| committer | Vasileios Kalintiris <Vasileios.Kalintiris@imgtec.com> | 2015-10-26 14:24:30 +0000 |
| commit | 165121f3261133eb9c587d6ac68a31a59f79891b (patch) | |
| tree | 71e4029f763f2247a228bf3e2eaba98f23beea93 /llvm/lib/Target/Mips | |
| parent | 493e57de01ecabc7af76a64cf39992d12efffca0 (diff) | |
| download | bcm5719-llvm-165121f3261133eb9c587d6ac68a31a59f79891b.tar.gz bcm5719-llvm-165121f3261133eb9c587d6ac68a31a59f79891b.zip | |
[mips] Check for the correct error message in tests for interrupt attributes.
Instead of XFAIL-ing the tests with the wrong usage of the "interrupt"
attribute, we should check that we emit the correct error messages to
the user.
llvm-svn: 251295
Diffstat (limited to 'llvm/lib/Target/Mips')
| -rw-r--r-- | llvm/lib/Target/Mips/MipsISelLowering.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/Target/Mips/MipsSEFrameLowering.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/Target/Mips/MipsISelLowering.cpp b/llvm/lib/Target/Mips/MipsISelLowering.cpp index a36725a9208..7e8bccddca5 100644 --- a/llvm/lib/Target/Mips/MipsISelLowering.cpp +++ b/llvm/lib/Target/Mips/MipsISelLowering.cpp @@ -2952,9 +2952,9 @@ MipsTargetLowering::LowerFormalArguments(SDValue Chain, const Function *Func = DAG.getMachineFunction().getFunction(); Function::const_arg_iterator FuncArg = Func->arg_begin(); - if (Func->hasFnAttribute("interrupt")) - assert(Func->arg_empty() && - "Functions with the interrupt attribute cannot have arguments!"); + if (Func->hasFnAttribute("interrupt") && !Func->arg_empty()) + report_fatal_error( + "Functions with the interrupt attribute cannot have arguments!"); CCInfo.AnalyzeFormalArguments(Ins, CC_Mips_FixedArg); MipsFI->setFormalArgInfo(CCInfo.getNextStackOffset(), diff --git a/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp b/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp index 70f4a637217..297e7a2ec8b 100644 --- a/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp +++ b/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp @@ -548,8 +548,8 @@ void MipsSEFrameLowering::emitInterruptPrologueStub( // clearing is not provided so reject that configuration. if (!STI.hasMips32r2()) report_fatal_error( - "\"interrupt\" attribute is not supported on pre-r2 MIPS or" - "Mips16 targets."); + "\"interrupt\" attribute is not supported on pre-MIPS32R2 or " + "MIPS16 targets."); // The GP register contains the "user" value, so we cannot perform // any gp relative loads until we restore the "kernel" or "system" gp @@ -561,7 +561,7 @@ void MipsSEFrameLowering::emitInterruptPrologueStub( if (!STI.isABI_O32() || STI.hasMips64()) report_fatal_error("\"interrupt\" attribute is only supported for the " - "O32 ABI on MIPS32r2+ at the present time."); + "O32 ABI on MIPS32R2+ at the present time."); // Perform ISR handling like GCC StringRef IntKind = |
