[llvm] r292544 - GlobalISel: Pass the MachineFunction in to reportSelectionError directly

[Justin Bogner via llvm-commits]

Author: bogner
Date: Thu Jan 19 18:16:19 2017
New Revision: 292544

URL: http://llvm.org/viewvc/llvm-project?rev=292544&view=rev
Log:
GlobalISel: Pass the MachineFunction in to reportSelectionError directly

Rather than trying to find MF based on the possibly-null MI we've
passed in here, just pass it in directly. It's already available at
all callers anyway.

Modified:
    llvm/trunk/lib/CodeGen/GlobalISel/InstructionSelect.cpp

Modified: llvm/trunk/lib/CodeGen/GlobalISel/InstructionSelect.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/GlobalISel/InstructionSelect.cpp?rev=292544&r1=292543&r2=292544&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/GlobalISel/InstructionSelect.cpp (original)
+++ llvm/trunk/lib/CodeGen/GlobalISel/InstructionSelect.cpp Thu Jan 19 18:16:19 2017
@@ -44,8 +44,8 @@ void InstructionSelect::getAnalysisUsage
   MachineFunctionPass::getAnalysisUsage(AU);
 }
 
-static void reportSelectionError(const MachineInstr *MI, const Twine &Message) {
-  const MachineFunction &MF = *MI->getParent()->getParent();
+static void reportSelectionError(const MachineFunction &MF,
+                                 const MachineInstr *MI, const Twine &Message) {
   std::string ErrStorage;
   raw_string_ostream Err(ErrStorage);
   Err << Message << ":\nIn function: " << MF.getName() << '\n';
@@ -83,7 +83,7 @@ bool InstructionSelect::runOnMachineFunc
     for (const MachineBasicBlock &MBB : MF)
       for (const MachineInstr &MI : MBB)
         if (isPreISelGenericOpcode(MI.getOpcode()) && !MLI->isLegal(MI, MRI))
-          reportSelectionError(&MI, "Instruction is not legal");
+          reportSelectionError(MF, &MI, "Instruction is not legal");
 
 #endif
   // FIXME: We could introduce new blocks and will need to fix the outer loop.
@@ -119,7 +119,7 @@ bool InstructionSelect::runOnMachineFunc
         if (TPC.isGlobalISelAbortEnabled())
           // FIXME: It would be nice to dump all inserted instructions.  It's
           // not obvious how, esp. considering select() can insert after MI.
-          reportSelectionError(&MI, "Cannot select");
+          reportSelectionError(MF, &MI, "Cannot select");
         Failed = true;
         break;
       }
@@ -146,7 +146,7 @@ bool InstructionSelect::runOnMachineFunc
                    : &*MRI.def_instr_begin(VReg);
     if (!RC) {
       if (TPC.isGlobalISelAbortEnabled())
-        reportSelectionError(MI, "VReg as no regclass after selection");
+        reportSelectionError(MF, MI, "VReg as no regclass after selection");
       Failed = true;
       break;
     }
@@ -155,7 +155,7 @@ bool InstructionSelect::runOnMachineFunc
         VRegToType.second.getSizeInBits() > (RC->getSize() * 8)) {
       if (TPC.isGlobalISelAbortEnabled())
         reportSelectionError(
-            MI, "VReg has explicit size different from class size");
+            MF, MI, "VReg has explicit size different from class size");
       Failed = true;
       break;
     }