llvmbot wrote:

<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-clang

Author: Hervé Poussineau (hpoussin)

<details>
<summary>Changes</summary>

Previously, this was calling TargetInstrInfo::getNop(), which contains:
 llvm_unreachable("Not implemented");

Fixes #<!-- -->134913.

---
Full diff: https://github.com/llvm/llvm-project/pull/135524.diff


3 Files Affected:

- (added) clang/test/CodeGen/Mips/unreachable.cpp (+13) 
- (modified) llvm/lib/Target/Mips/MipsInstrInfo.cpp (+7) 
- (modified) llvm/lib/Target/Mips/MipsInstrInfo.h (+2) 


``````````diff
diff --git a/clang/test/CodeGen/Mips/unreachable.cpp 
b/clang/test/CodeGen/Mips/unreachable.cpp
new file mode 100644
index 0000000000000..04fec8598088d
--- /dev/null
+++ b/clang/test/CodeGen/Mips/unreachable.cpp
@@ -0,0 +1,13 @@
+// REQUIRES: mips-registered-target
+// RUN: %clang_cc1 -triple mipsel-w64-windows-gnu -x c++ -mrelocation-model 
static -emit-obj %s -o - | llvm-objdump -a - | FileCheck %s
+// CHECK: file format coff-mips
+
+[[__noreturn__]] inline void g() {
+  __builtin_unreachable();
+}
+
+void f(int i)
+{
+  if (i == 0)
+    g();
+}
diff --git a/llvm/lib/Target/Mips/MipsInstrInfo.cpp 
b/llvm/lib/Target/Mips/MipsInstrInfo.cpp
index b81bb1186de72..0abe228b7547a 100644
--- a/llvm/lib/Target/Mips/MipsInstrInfo.cpp
+++ b/llvm/lib/Target/Mips/MipsInstrInfo.cpp
@@ -87,6 +87,13 @@ MipsInstrInfo::GetMemOperand(MachineBasicBlock &MBB, int FI,
                                  MFI.getObjectAlign(FI));
 }
 
+MCInst MipsInstrInfo::getNop() const {
+  MCInst Nop;
+  // using Mips::NOP gives "fatal error: error in backend: Not supported 
instr: <MCInst 580>"
+  Nop.setOpcode(Mips::SSNOP);
+  return Nop;
+}
+
 
//===----------------------------------------------------------------------===//
 // Branch Analysis
 
//===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Target/Mips/MipsInstrInfo.h 
b/llvm/lib/Target/Mips/MipsInstrInfo.h
index 06964c0161b4b..367f0ac5e8390 100644
--- a/llvm/lib/Target/Mips/MipsInstrInfo.h
+++ b/llvm/lib/Target/Mips/MipsInstrInfo.h
@@ -59,6 +59,8 @@ class MipsInstrInfo : public MipsGenInstrInfo {
 
   static const MipsInstrInfo *create(MipsSubtarget &STI);
 
+  MCInst getNop() const override;
+
   /// Branch Analysis
   bool analyzeBranch(MachineBasicBlock &MBB, MachineBasicBlock *&TBB,
                      MachineBasicBlock *&FBB,

``````````

</details>


https://github.com/llvm/llvm-project/pull/135524
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

Reply via email to