diff options
author | Manman Ren <manman.ren@gmail.com> | 2013-12-09 21:06:30 +0000 |
---|---|---|
committer | Manman Ren <manman.ren@gmail.com> | 2013-12-09 21:06:30 +0000 |
commit | 27457ac42f7a9267ab7e0190424a95fecf0ea201 (patch) | |
tree | 132247fae880294687361f9bec1aebd615a48a90 /lib/IR/Module.cpp | |
parent | 782ff3b70086bd3580f12228082ea998f152f9cd (diff) | |
download | llvm-27457ac42f7a9267ab7e0190424a95fecf0ea201.tar.gz llvm-27457ac42f7a9267ab7e0190424a95fecf0ea201.tar.bz2 llvm-27457ac42f7a9267ab7e0190424a95fecf0ea201.tar.xz |
Merging r196158:
------------------------------------------------------------------------
r196158 | mren | 2013-12-02 13:29:56 -0800 (Mon, 02 Dec 2013) | 12 lines
Debug Info: drop debug info via upgrading path if version number does not match.
Add a helper function getDebugInfoVersionFromModule to return the debug info
version number for a module.
"Verifier/module-flags-1.ll" checks for verification errors.
It will seg fault when calling getDebugInfoVersionFromModule because of the
incorrect format for module flags in the testing case. We make
getModuleFlagsMetadata more robust by checking for error conditions.
PR17982
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@196822 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/IR/Module.cpp')
-rw-r--r-- | lib/IR/Module.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/IR/Module.cpp b/lib/IR/Module.cpp index 3dd1f7e810..4f240c783e 100644 --- a/lib/IR/Module.cpp +++ b/lib/IR/Module.cpp @@ -318,11 +318,16 @@ getModuleFlagsMetadata(SmallVectorImpl<ModuleFlagEntry> &Flags) const { for (unsigned i = 0, e = ModFlags->getNumOperands(); i != e; ++i) { MDNode *Flag = ModFlags->getOperand(i); - ConstantInt *Behavior = cast<ConstantInt>(Flag->getOperand(0)); - MDString *Key = cast<MDString>(Flag->getOperand(1)); - Value *Val = Flag->getOperand(2); - Flags.push_back(ModuleFlagEntry(ModFlagBehavior(Behavior->getZExtValue()), - Key, Val)); + if (Flag->getNumOperands() >= 3 && isa<ConstantInt>(Flag->getOperand(0)) && + isa<MDString>(Flag->getOperand(1))) { + // Check the operands of the MDNode before accessing the operands. + // The verifier will actually catch these failures. + ConstantInt *Behavior = cast<ConstantInt>(Flag->getOperand(0)); + MDString *Key = cast<MDString>(Flag->getOperand(1)); + Value *Val = Flag->getOperand(2); + Flags.push_back(ModuleFlagEntry(ModFlagBehavior(Behavior->getZExtValue()), + Key, Val)); + } } } |