[llvm] r204901 - Rejected r204899 and r204900 due to remaining test failures on cmake-llvm-x86_64-linux buildbot.

[Stepan Dyatkovskiy]

Hi Rafael,

Right. Thank you for reviews.
I didn't notice r204898, because it was made almost at the same time, 
and it was applied exactly to the subject of this patch. So I just was a 
bit confused about all the failures that followed after my commit. Some 
of buildbots tells me about troubles with '-' symbol (I used it as 
stdout/input alias. So, I decided, that that was the reason of failures.

It didn't help, so I rejected everything I committed.

But then (after two hours) I noticed r204898, and it made a sense :-)

I think patch we discussed here could cover pr18931 (for which error 
message was introduced in r204898). And if it didn't cover every aspect 
of complex imm expressions, I'm ready to proceed further work on this 
problem.

-Stepan

Rafael Espíndola wrote:
> This is because of r204898, right?
>
> Jiangning, any reason to reject this so early? It seems better to wait
> and see if we can resolve the expression once Layout is available.
>
> On 27 March 2014 04:38, Stepan Dyatkovskiy <stpworld at narod.ru> wrote:
>> Author: dyatkovskiy
>> Date: Thu Mar 27 03:38:18 2014
>> New Revision: 204901
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=204901&view=rev
>> Log:
>> Rejected r204899 and r204900 due to remaining test failures on cmake-llvm-x86_64-linux buildbot.
>>
>> Removed:
>>      llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s
>> Modified:
>>      llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
>>
>> Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp?rev=204901&r1=204900&r2=204901&view=diff
>> ==============================================================================
>> --- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp (original)
>> +++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp Thu Mar 27 03:38:18 2014
>> @@ -271,23 +271,7 @@ public:
>>     unsigned getSOImmOpValue(const MCInst &MI, unsigned Op,
>>                              SmallVectorImpl<MCFixup> &Fixups,
>>                              const MCSubtargetInfo &STI) const {
>> -
>> -    const MCOperand &MO = MI.getOperand(Op);
>> -
>> -    // We expect MO to be an immediate or an expression,
>> -    // if it is an immediate - that's fine, just encode the value.
>> -    // Otherwise - create a Fixup.
>> -    if (MO.isExpr()) {
>> -      const MCExpr *Expr = MO.getExpr();
>> -      // In instruction code this value always encoded as lowest 12 bits,
>> -      // so we don't have to perform any specific adjustments and
>> -      // can use just 2-bytes fixup.
>> -      MCFixupKind Kind = MCFixupKind(FK_Data_2);
>> -      Fixups.push_back(MCFixup::Create(0, Expr, Kind, MI.getLoc()));
>> -      return 0;
>> -    }
>> -
>> -    unsigned SoImm = MO.getImm();
>> +    unsigned SoImm = MI.getOperand(Op).getImm();
>>       int SoImmVal = ARM_AM::getSOImmVal(SoImm);
>>       assert(SoImmVal != -1 && "Not a valid so_imm value!");
>>
>>
>> Removed: llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s?rev=204900&view=auto
>> ==============================================================================
>> --- llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s (original)
>> +++ llvm/trunk/test/MC/ARM/cmp-immediate-fixup.s (removed)
>> @@ -1,9 +0,0 @@
>> -// PR18931
>> -// RUN: llvm-mc %s -triple=arm-linux-gnueabi -filetype=obj -o %t
>> -// RUN: llvm-objdump --disassemble -arch=arm %t | FileCheck %s
>> -
>> -    .text
>> -// CHECK: cmp r2, #1
>> -    cmp r2, #(l2 - l1 + 4) >> 2
>> -l1:
>> -l2:
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits