Change llvm.gcroot to not init the root to null at runtime, this prevents

using it for live-in values etc.

llvm-svn: 41879

2 files changed, 5 insertions, 7 deletions

diff --git a/llvm/docs/GarbageCollection.html b/llvm/docs/GarbageCollection.html
index 0accd0c78a0..e39e85ce3cd 100644
--- a/llvm/docs/GarbageCollection.html
+++ b/llvm/docs/GarbageCollection.html
@@ -166,9 +166,7 @@ interface that front-end authors should generate code for.
 The <tt>llvm.gcroot</tt> intrinsic is used to inform LLVM of a pointer variable
 on the stack.  The first argument contains the address of the variable on the
 stack, and the second contains a pointer to metadata that should be associated
-with the pointer (which <b>must</b> be a constant or global value address).  At
-runtime, the <tt>llvm.gcroot</tt> intrinsic stores a null pointer into the
-specified location to initialize the pointer.</p>
+with the pointer (which <b>must</b> be a constant or global value address).</p>
 
 <p>
 Consider the following fragment of Java code:
@@ -193,6 +191,9 @@ Entry:
    %X = alloca %Object*
    ...
 
+   ;; Java null-initializes pointers.
+   store %Object* null, %Object** %X
+
    ;; "CodeBlock" is the block corresponding to the start
    ;;  of the scope above.
 CodeBlock:
diff --git a/llvm/lib/Transforms/Scalar/LowerGC.cpp b/llvm/lib/Transforms/Scalar/LowerGC.cpp
index 98070995afc..bac7ac799bd 100644
--- a/llvm/lib/Transforms/Scalar/LowerGC.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerGC.cpp
@@ -284,10 +284,7 @@ bool LowerGC::runOnFunction(Function &F) {
     new StoreInst(Null, RootPtrPtr, IP);
 
     // Each occurrance of the llvm.gcroot intrinsic now turns into an
-    // initialization of the slot with the address and a zeroing out of the
-    // address specified.
-    new StoreInst(Constant::getNullValue(PtrLocTy->getElementType()),
-                  GCRoots[i]->getOperand(1), GCRoots[i]);
+    // initialization of the slot with the address.
     new StoreInst(GCRoots[i]->getOperand(1), RootPtrPtr, GCRoots[i]);
   }