Index: llvm/lib/Transforms/IPO/AttributorAttributes.cpp
===================================================================
--- llvm/lib/Transforms/IPO/AttributorAttributes.cpp
+++ llvm/lib/Transforms/IPO/AttributorAttributes.cpp
@@ -101,6 +101,13 @@
 
 STATISTIC(NumAAs, "Number of abstract attributes created");
 
+
+static const unsigned CallLikeOpcodes[] = {
+  Instruction::Call, Instruction::Invoke,
+  Instruction::CatchSwitch, Instruction::Resume,
+  Instruction::CleanupRet, Instruction::CallBr
+};
+
 // Some helper macros to deal with statistics tracking.
 //
 // Usage:
@@ -1633,7 +1640,7 @@
     };
 
     bool UsedAssumedInformation = false;
-    if (!A.checkForAllInstructions(CheckForNoUnwind, *this, Opcodes,
+    if (!A.checkForAllInstructions(CheckForNoUnwind, *this, CallLikeOpcodes,
                                    UsedAssumedInformation))
       return indicatePessimisticFixpoint();