Fix-up opcodes that are different in 3.0

llvm/core.py

@@ -58,8 +58,7 @@ TYPE_FUNCTION   = 10
 TYPE_STRUCT     = 11
 TYPE_ARRAY      = 12
 TYPE_POINTER    = 13
-TYPE_OPAQUE     = 14
-TYPE_VECTOR     = 15
+TYPE_VECTOR     = 14
 
 
 # value IDs (llvm::Value::ValueTy enum)
@@ -92,54 +91,59 @@ OPCODE_SWITCH         = 3
 OPCODE_INDIRECT_BR    = 4
 OPCODE_INVOKE         = 5
 OPCODE_UNWIND         = 6
-OPCODE_UNREACHABLE    = 7
-OPCODE_ADD            = 8
-OPCODE_FADD           = 9
-OPCODE_SUB            = 10
-OPCODE_FSUB           = 11
-OPCODE_MUL            = 12
-OPCODE_FMUL           = 13
-OPCODE_UDIV           = 14
-OPCODE_SDIV           = 15
-OPCODE_FDIV           = 16
-OPCODE_UREM           = 17
-OPCODE_SREM           = 18
-OPCODE_FREM           = 19
-OPCODE_SHL            = 20
-OPCODE_LSHR           = 21
-OPCODE_ASHR           = 22
-OPCODE_AND            = 23
-OPCODE_OR             = 24
-OPCODE_XOR            = 25
-OPCODE_ALLOCA         = 26
-OPCODE_LOAD           = 27
-OPCODE_STORE          = 28
-OPCODE_GETELEMENTPTR  = 29
-OPCODE_TRUNC          = 30
-OPCODE_ZEXT           = 31
-OPCODE_SEXT           = 32
-OPCODE_FPTOUI         = 33
-OPCODE_FPTOSI         = 34
-OPCODE_UITOFP         = 35
-OPCODE_SITOFP         = 36
-OPCODE_FPTRUNC        = 37
-OPCODE_FPEXT          = 38
-OPCODE_PTRTOINT       = 39
-OPCODE_INTTOPTR       = 40
-OPCODE_BITCAST        = 41
-OPCODE_ICMP           = 42
-OPCODE_FCMP           = 43
-OPCODE_PHI            = 44
-OPCODE_CALL           = 45
-OPCODE_SELECT         = 46
-OPCODE_USEROP1        = 47
-OPCODE_USEROP2        = 48
-OPCODE_VAARG          = 49
-OPCODE_EXTRACTELEMENT = 50
-OPCODE_INSERTELEMENT  = 51
-OPCODE_SHUFFLEVECTOR  = 52
-OPCODE_EXTRACTVALUE   = 53
-OPCODE_INSERTVALUE    = 54
+OPCODE_RESUME         = 7
+OPCODE_UNREACHABLE    = 8
+OPCODE_ADD            = 9
+OPCODE_FADD           = 10
+OPCODE_SUB            = 11
+OPCODE_FSUB           = 12
+OPCODE_MUL            = 13
+OPCODE_FMUL           = 14
+OPCODE_UDIV           = 15
+OPCODE_SDIV           = 16
+OPCODE_FDIV           = 17
+OPCODE_UREM           = 18
+OPCODE_SREM           = 19
+OPCODE_FREM           = 20
+OPCODE_SHL            = 21
+OPCODE_LSHR           = 22
+OPCODE_ASHR           = 23
+OPCODE_AND            = 24
+OPCODE_OR             = 25
+OPCODE_XOR            = 26
+OPCODE_ALLOCA         = 27
+OPCODE_LOAD           = 28
+OPCODE_STORE          = 29
+OPCODE_GETELEMENTPTR  = 30
+OPCODE_FENCE          = 31
+OPCODE_ATOMICCMPXCHG  = 32
+OPCODE_ATOMICRMW      = 33
+OPCODE_TRUNC          = 34
+OPCODE_ZEXT           = 35
+OPCODE_SEXT           = 36
+OPCODE_FPTOUI         = 37
+OPCODE_FPTOSI         = 38
+OPCODE_UITOFP         = 39
+OPCODE_SITOFP         = 40
+OPCODE_FPTRUNC        = 41
+OPCODE_FPEXT          = 42
+OPCODE_PTRTOINT       = 43
+OPCODE_INTTOPTR       = 44
+OPCODE_BITCAST        = 45
+OPCODE_ICMP           = 46
+OPCODE_FCMP           = 47
+OPCODE_PHI            = 48
+OPCODE_CALL           = 49
+OPCODE_SELECT         = 50
+OPCODE_USEROP1        = 51
+OPCODE_USEROP2        = 52
+OPCODE_VAARG          = 53
+OPCODE_EXTRACTELEMENT = 54
+OPCODE_INSERTELEMENT  = 55
+OPCODE_SHUFFLEVECTOR  = 56
+OPCODE_EXTRACTVALUE   = 57
+OPCODE_INSERTVALUE    = 58
+OPCODE_LANDINGPAD     = 59
 
 # calling conventions
 CC_C             = 0