From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Sat, 15 Jan 2011 08:20:57 +0000 (+0000)
Subject: Add a clarification about merging constants with and without unnamed_addr.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a5eaa861e48641916dc40a9be8ade17842ac8d07;p=oota-llvm.git

Add a clarification about merging constants with and without unnamed_addr.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123530 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/docs/LangRef.html b/docs/LangRef.html
index 2121fc67408..5a53c9aed4e 100644
--- a/docs/LangRef.html
+++ b/docs/LangRef.html
@@ -848,7 +848,10 @@ define i32 @main() {   <i>; i32()* </i>&nbsp;
 
 <p>Global variables can be marked with <tt>unnamed_addr</tt> which indicates
   that the address is not significant, only the content. Constants marked
-  like this can be merged if they have the same content.</p>
+  like this can be merged with other constants if they have the same
+  initializer. Note that a constant with significant address <em>can</em>
+  be merged with a <tt>unnamed_addr</tt> constant, the result being a
+  constant whose address is significant.</p>
 
 <p>A global variable may be declared to reside in a target-specific numbered
    address space. For targets that support them, address spaces may affect how