maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix -Werror when compiling rL318083 (ter) 

Statically assert the result and remove a runtime comparison, a direct consequence of the optimization introduced in rL318083.

llvm-svn: 318091
This commit is contained in:
Serge Guelton 2017-11-13 21:55:01 +00:00
parent 3347332ad3
commit 9fd33f249f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/IR/Value.cpp
View File

@ -50,6 +50,7 @@ Value::Value(Type *ty, unsigned scid)
: VTy(checkType(ty)), UseList(nullptr), SubclassID(scid), : VTy(checkType(ty)), UseList(nullptr), SubclassID(scid),
HasValueHandle(0), SubclassOptionalData(0), SubclassData(0), HasValueHandle(0), SubclassOptionalData(0), SubclassData(0),
NumUserOperands(0), IsUsedByMD(false), HasName(false) { NumUserOperands(0), IsUsedByMD(false), HasName(false) {
static_assert(ConstantFirstVal == 0, "!(SubclassID < ConstantFirstVal)");
// FIXME: Why isn't this in the subclass gunk?? // FIXME: Why isn't this in the subclass gunk??
// Note, we cannot call isa<CallInst> before the CallInst has been // Note, we cannot call isa<CallInst> before the CallInst has been
// constructed. // constructed.
@ -57,7 +58,7 @@ Value::Value(Type *ty, unsigned scid)
assert((VTy->isFirstClassType() || VTy->isVoidTy() || VTy->isStructTy()) && assert((VTy->isFirstClassType() || VTy->isVoidTy() || VTy->isStructTy()) &&
"invalid CallInst type!"); "invalid CallInst type!");
else if (SubclassID != BasicBlockVal && else if (SubclassID != BasicBlockVal &&
(SubclassID < ConstantFirstVal || SubclassID > ConstantLastVal)) (/*SubclassID < ConstantFirstVal ||*/ SubclassID > ConstantLastVal))
assert((VTy->isFirstClassType() || VTy->isVoidTy()) && assert((VTy->isFirstClassType() || VTy->isVoidTy()) &&
"Cannot create non-first-class values except for constants!"); "Cannot create non-first-class values except for constants!");
static_assert(sizeof(Value) == 2 * sizeof(void *) + 2 * sizeof(unsigned), static_assert(sizeof(Value) == 2 * sizeof(void *) + 2 * sizeof(unsigned),