projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This situation can occur:
[oota-llvm.git]
/
lib
/
VMCore
/
IntrinsicInst.cpp
diff --git
a/lib/VMCore/IntrinsicInst.cpp
b/lib/VMCore/IntrinsicInst.cpp
index 2c2c5a96edfd22c9cde80baa9fa44faeee8bcac0..94f582911e13534f25d37d1fcfb24a9d9dd1ceae 100644
(file)
--- a/
lib/VMCore/IntrinsicInst.cpp
+++ b/
lib/VMCore/IntrinsicInst.cpp
@@
-2,8
+2,8
@@
//
// The LLVM Compiler Infrastructure
//
//
// The LLVM Compiler Infrastructure
//
-// This file
was developed by James M. Laskey and is distributed under
-//
the University of Illinois Open Source
License. See LICENSE.TXT for details.
+// This file
is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
//
//===----------------------------------------------------------------------===//
//
@@
-26,10
+26,9
@@
//===----------------------------------------------------------------------===//
#include "llvm/IntrinsicInst.h"
//===----------------------------------------------------------------------===//
#include "llvm/IntrinsicInst.h"
-
#include "llvm/Constants.h"
#include "llvm/GlobalVariable.h"
#include "llvm/Constants.h"
#include "llvm/GlobalVariable.h"
-
+#include "llvm/CodeGen/MachineModuleInfo.h"
using namespace llvm;
//===----------------------------------------------------------------------===//
using namespace llvm;
//===----------------------------------------------------------------------===//
@@
-38,7
+37,7
@@
using namespace llvm;
static Value *CastOperand(Value *C) {
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C))
static Value *CastOperand(Value *C) {
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(C))
- if (CE->
getOpcode() == Instruction::Cast
)
+ if (CE->
isCast()
)
return CE->getOperand(0);
return NULL;
}
return CE->getOperand(0);
return NULL;
}
@@
-59,15
+58,19
@@
Value *DbgInfoIntrinsic::StripCast(Value *C) {
///
std::string DbgStopPointInst::getFileName() const {
///
std::string DbgStopPointInst::getFileName() const {
+ // Once the operand indices are verified, update this assert
+ assert(LLVMDebugVersion == (6 << 16) && "Verify operand indices");
GlobalVariable *GV = cast<GlobalVariable>(getContext());
GlobalVariable *GV = cast<GlobalVariable>(getContext());
+ if (!GV->hasInitializer()) return "";
ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
- return CS->getOperand(
4
)->getStringValue();
+ return CS->getOperand(
3
)->getStringValue();
}
std::string DbgStopPointInst::getDirectory() const {
}
std::string DbgStopPointInst::getDirectory() const {
+ // Once the operand indices are verified, update this assert
+ assert(LLVMDebugVersion == (6 << 16) && "Verify operand indices");
GlobalVariable *GV = cast<GlobalVariable>(getContext());
GlobalVariable *GV = cast<GlobalVariable>(getContext());
+ if (!GV->hasInitializer()) return "";
ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
- return CS->getOperand(
5
)->getStringValue();
+ return CS->getOperand(
4
)->getStringValue();
}
}
-
-//===----------------------------------------------------------------------===//