diff options
| -rw-r--r-- | docs/LangRef.html | 7 | ||||
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/docs/LangRef.html b/docs/LangRef.html index 52ec97888d..9ef7cce419 100644 --- a/docs/LangRef.html +++ b/docs/LangRef.html @@ -564,9 +564,10 @@ define i32 @main() { <i>; i32()* </ global scope. Symbols with "<tt>common</tt>" linkage are merged in the same way as <tt>weak symbols</tt>, and they may not be deleted if unreferenced. - Further, <tt>common</tt> symbols may not have an explicit section, and - must have a zero initializer. Functions and aliases may not have common - linkage.</dd> + <tt>common</tt> symbols may not have an explicit section, + must have a zero initializer, and may not be marked '<a + href="#globalvars"><tt>constant</tt></a>'. Functions and aliases may not + have common linkage.</dd> <dt><tt><b><a name="linkage_appending">appending</a></b></tt>: </dt> diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index f50299bdc0..9ca048838e 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -378,11 +378,14 @@ void Verifier::visitGlobalVariable(GlobalVariable &GV) { "Global variable initializer type does not match global " "variable type!", &GV); - // If the global has common linkage, it must have a zero initializer. - if (GV.hasCommonLinkage()) + // If the global has common linkage, it must have a zero initializer and + // cannot be constant. + if (GV.hasCommonLinkage()) { Assert1(GV.getInitializer()->isNullValue(), "'common' global must have a zero initializer!", &GV); - + Assert1(!GV.isConstant(), "'common' global may not be marked constant!", + &GV); + } // Verify that any metadata used in a global initializer points only to // other globals. |