[llvm-branch-commits] [cfe-branch] r196818 - Merging r196143:

[Manman Ren]

Author: mren
Date: Mon Dec  9 15:02:26 2013
New Revision: 196818

URL: http://llvm.org/viewvc/llvm-project?rev=196818&view=rev
Log:
Merging r196143:
------------------------------------------------------------------------
r196143 | mren | 2013-12-02 11:37:35 -0800 (Mon, 02 Dec 2013) | 1 line

Expand comments for Debug Info Version.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/lib/CodeGen/CodeGenModule.cpp

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  9 15:02:26 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195495,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196153,196189-196192,196198-196199,196206,196208-196209,196211,196215,196359-196362,196370,196387,196423,196454,196456,196459,196488,196532-196533,196535,196538,196588,196593,196599,196630,196658,196712,196720,196724
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195249,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195495,195501,195547,195556,195558,195587,195620,195635,195669,195687,195693,195710,195713,195716,195756,195760,195768,195777,195789,195792,195804,195827,195843-195844,195877,195887-195888,195897,195903,195905-195906,195932,195936-195943,195970,195983,196045,196048,196050,196058,196114-196115,196143,196153,196189-196192,196198-196199,196206,196208-196209,196211,196215,196359-196362,196370,196387,196423,196454,196456,196459,196488,196532-196533,196535,196538,196588,196593,196599,196630,196658,196712,196720,196724
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/CodeGen/CodeGenModule.cpp?rev=196818&r1=196817&r2=196818&view=diff
==============================================================================
--- cfe/branches/release_34/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/branches/release_34/lib/CodeGen/CodeGenModule.cpp Mon Dec  9 15:02:26 2013
@@ -260,7 +260,10 @@ void CodeGenModule::Release() {
                               CodeGenOpts.DwarfVersion);
   if (DebugInfo)
     // We support a single version in the linked module: error out when
-    // modules do not have the same version.
+    // modules do not have the same version. We are going to implement dropping
+    // debug info when the version number is not up-to-date. Once that is
+    // done, the bitcode linker is not going to see modules with different
+    // version numbers.
     getModule().addModuleFlag(llvm::Module::Error, "Debug Info Version",
                               llvm::dwarf::DEBUG_INFO_VERSION);