[lanai] isBrImm should accept any non-constant immediate.

[jpienaar]

Summary

isBrImm should accept any non-constant immediate. Previously it was only accepting LanaiMCExpr ones which was wrong.

[jpienaar]

Changing to test that uses llvm-mc directly instead of llc.

[majnemer]

LGTM

llvm/trunk/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp

public:
 
   bool isToken() const override { return Kind == TOKEN; }
 
   bool isBrImm() {
     if (!isImm())
       return false;
 
     // Constant case
-    if (const MCConstantExpr *ConstExpr = dyn_cast<MCConstantExpr>(Imm.Value)) {
-      int64_t Value = ConstExpr->getValue();
-      // Check if value fits in 25 bits with 2 least significant bits 0.
-      return isShiftedUInt<23, 2>(static_cast<int32_t>(Value));
-    }
+    const MCConstantExpr *MCE = dyn_cast<MCConstantExpr>(Imm.Value);
+    if (!MCE)
+      return true;
+    int64_t Value = MCE->getValue();
 
-    // Symbolic reference expression
-    if (const LanaiMCExpr *SymbolRefExpr = dyn_cast<LanaiMCExpr>(Imm.Value))
-      return SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_None;
-
-    // Binary expression
-    if (const MCBinaryExpr *BinaryExpr = dyn_cast<MCBinaryExpr>(Imm.Value))
-      if (const LanaiMCExpr *SymbolRefExpr =
-              dyn_cast<LanaiMCExpr>(BinaryExpr->getLHS()))
-        return SymbolRefExpr->getKind() == LanaiMCExpr::VK_Lanai_None;
-
-    return false;
-  }
-
   bool isBrTarget() { return isBrImm() || isToken(); }
 
   bool isCallTarget() { return isImm() || isToken(); }
 
   bool isHiImm16() {
     if (!isImm())
       return false;
 

llvm/trunk/test/MC/Lanai/ctrl-instructions.s

+// RUN: llvm-mc -triple lanai-unknown-unknown -show-encoding -o - %s | FileCheck %s
+
+// CHECK: bt .Ltmp0 ! encoding: [0b1110000A,A,A,A]
+// CHECK-NEXT:      ! fixup A - offset: 0, value: .Ltmp0, kind: FIXUP_LANAI_25
+  bt 1f
+  nop
+1:
+
+// CHECK: bt foo    ! encoding: [0b1110000A,A,A,A]
+// CHECK-NEXT:      !   fixup A - offset: 0, value: foo, kind: FIXUP_LANAI_25
+  bt foo
+  nop
+