No functional change, this is just easier to read and debug.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@35782 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bytecode/Reader/Reader.cpp b/lib/Bytecode/Reader/Reader.cpp
index f0f6597..82b1888 100644
--- a/lib/Bytecode/Reader/Reader.cpp
+++ b/lib/Bytecode/Reader/Reader.cpp
@@ -276,16 +276,17 @@
}
}
- if (GlobalTyID < ModuleValues.size() && ModuleValues[GlobalTyID]) {
- if (Num < ModuleValues[GlobalTyID]->size())
- return ModuleValues[GlobalTyID]->getOperand(Num);
- Num -= ModuleValues[GlobalTyID]->size();
- }
+ if (GlobalTyID < ModuleValues.size())
+ if (ValueList *Globals = ModuleValues[GlobalTyID]) {
+ if (Num < Globals->size())
+ return Globals->getOperand(Num);
+ Num -= Globals->size();
+ }
- if (FunctionValues.size() > type &&
- FunctionValues[type] &&
- Num < FunctionValues[type]->size())
- return FunctionValues[type]->getOperand(Num);
+ if (type < FunctionValues.size())
+ if (ValueList *Locals = FunctionValues[type])
+ if (Num < Locals->size())
+ return Locals->getOperand(Num);
if (!Create) return 0; // Do not create a placeholder?