[dragonegg] r196759 - Merging r196157:

[Bill Wendling]

Author: void
Date: Mon Dec  9 02:34:34 2013
New Revision: 196759

URL: http://llvm.org/viewvc/llvm-project?rev=196759&view=rev
Log:
Merging r196157:
------------------------------------------------------------------------
r196157 | mren | 2013-12-02 13:26:02 -0800 (Mon, 02 Dec 2013) | 4 lines

Debug info metadata without a version or with an outdated version will be
dropped. Add a version here to avoid that.


------------------------------------------------------------------------

Modified:
    dragonegg/branches/release_34/   (props changed)
    dragonegg/branches/release_34/src/Debug.cpp

Propchange: dragonegg/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  9 02:34:34 2013
@@ -1 +1 @@
-/dragonegg/trunk:195356,195404
+/dragonegg/trunk:195356,195404,196157

Modified: dragonegg/branches/release_34/src/Debug.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/branches/release_34/src/Debug.cpp?rev=196759&r1=196758&r2=196759&view=diff
==============================================================================
--- dragonegg/branches/release_34/src/Debug.cpp (original)
+++ dragonegg/branches/release_34/src/Debug.cpp Mon Dec  9 02:34:34 2013
@@ -976,6 +976,10 @@ DIType DebugInfo::getOrCreateType(tree t
 /// initialization is done.
 void DebugInfo::Initialize() {
 
+  // Debug info metadata without a version or with an outdated version will be
+  // dropped. Add a version here to avoid that.
+  M.addModuleFlag(llvm::Module::Error, "Debug Info Version",
+                  llvm::DEBUG_METADATA_VERSION);
   // Each input file is encoded as a separate compile unit in LLVM
   // debugging information output. However, many target specific tool chains
   // prefer to encode only one compile unit in an object file. In this