[llvm] r187099 - Check that TD isn't NULL before dereferencing it down this path.

Nick Lewycky nicholas at mxc.ca
Wed Jul 24 19:55:15 PDT 2013


Author: nicholas
Date: Wed Jul 24 21:55:14 2013
New Revision: 187099

URL: http://llvm.org/viewvc/llvm-project?rev=187099&view=rev
Log:
Check that TD isn't NULL before dereferencing it down this path.

Added:
    llvm/trunk/test/Transforms/GlobalOpt/invariant-nodatalayout.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=187099&r1=187098&r2=187099&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Wed Jul 24 21:55:14 2013
@@ -2783,7 +2783,7 @@ bool Evaluator::EvaluateBlock(BasicBlock
           Value *Ptr = PtrArg->stripPointerCasts();
           if (GlobalVariable *GV = dyn_cast<GlobalVariable>(Ptr)) {
             Type *ElemTy = cast<PointerType>(GV->getType())->getElementType();
-            if (!Size->isAllOnesValue() &&
+            if (TD && !Size->isAllOnesValue() &&
                 Size->getValue().getLimitedValue() >=
                 TD->getTypeStoreSize(ElemTy)) {
               Invariants.insert(GV);

Added: llvm/trunk/test/Transforms/GlobalOpt/invariant-nodatalayout.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/invariant-nodatalayout.ll?rev=187099&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/invariant-nodatalayout.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/invariant-nodatalayout.ll Wed Jul 24 21:55:14 2013
@@ -0,0 +1,17 @@
+; RUN: opt -globalopt -S -o - < %s | FileCheck %s
+; The check here is that it doesn't crash.
+
+declare {}* @llvm.invariant.start(i64 %size, i8* nocapture %ptr)
+
+ at object1 = global { i32, i32 } zeroinitializer
+; CHECK: @object1 = global { i32, i32 } zeroinitializer
+
+define void @ctor1() {
+  %ptr = bitcast {i32, i32}* @object1 to i8*
+  call {}* @llvm.invariant.start(i64 4, i8* %ptr)
+  ret void
+}
+
+ at llvm.global_ctors = appending constant
+  [1 x { i32, void ()* }]
+  [ { i32, void ()* } { i32 65535, void ()* @ctor1 } ]





More information about the llvm-commits mailing list