From ffaca140d01b0b93723c3322b08351b03b95831f Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Thu, 10 Jun 2021 16:18:57 -0700 Subject: [PATCH] [IR] Value: Fix OpCode checks Value::SubclassID cannot be directly compared to Instruction enums, such as Instruction::{Call,Invoke,CallBr}. We have to first subtract InstructionVal from the SubclassID to get the OpCode, similar to Instruction::getOpCode(). Reviewed By: nickdesaulniers Differential Revision: https://reviews.llvm.org/D104043 --- llvm/lib/IR/Value.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/llvm/lib/IR/Value.cpp b/llvm/lib/IR/Value.cpp index 33b61c9..c3796f1 100644 --- a/llvm/lib/IR/Value.cpp +++ b/llvm/lib/IR/Value.cpp @@ -58,10 +58,13 @@ Value::Value(Type *ty, unsigned scid) // FIXME: Why isn't this in the subclass gunk?? // Note, we cannot call isa before the CallInst has been // constructed. - if (SubclassID == Instruction::Call || SubclassID == Instruction::Invoke || - SubclassID == Instruction::CallBr) + unsigned OpCode = 0; + if (SubclassID >= InstructionVal) + OpCode = SubclassID - InstructionVal; + if (OpCode == Instruction::Call || OpCode == Instruction::Invoke || + OpCode == Instruction::CallBr) assert((VTy->isFirstClassType() || VTy->isVoidTy() || VTy->isStructTy()) && - "invalid CallInst type!"); + "invalid CallBase type!"); else if (SubclassID != BasicBlockVal && (/*SubclassID < ConstantFirstVal ||*/ SubclassID > ConstantLastVal)) assert((VTy->isFirstClassType() || VTy->isVoidTy()) && -- 2.7.4