[llvm-branch-commits] [llvm-branch] r196823 - Merging r196172:

[Manman Ren]

Author: mren
Date: Mon Dec  9 15:07:27 2013
New Revision: 196823

URL: http://llvm.org/viewvc/llvm-project?rev=196823&view=rev
Log:
Merging r196172:
------------------------------------------------------------------------
r196172 | mren | 2013-12-02 16:12:14 -0800 (Mon, 02 Dec 2013) | 4 lines

Debug Info: rename getDebugInfoVersionFromModule to getDebugMetadataVersionFromModule.

Suggested by Eric.

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

Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/include/llvm/DebugInfo.h
    llvm/branches/release_34/lib/IR/AutoUpgrade.cpp
    llvm/branches/release_34/lib/IR/DebugInfo.cpp

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  9 15:07:27 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195148,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195401,195408,195421,195423-195424,195432,195439,195444,195455-195456,195469,195476-195477,195479,195491-195495,195504-195505,195514,195528,195535,195547,195567,195573-195576,195590-195591,195599,195632,195635-195636,195670,195677,195679,195682,195684,195713,195716,195769,195773,195779,195782,195787-195788,195791,195803,195812,195827,195834,195843-195844,195878-195881,195887,195903,195905,195912,195915,195932,195936-195943,195972-195973,195975-195976,196004,196044-196046,196069,196100,196104,196129,196144,196151,196153,196156,196158,196189-196192,196198-196199,196208-196211,196261,196267,196269,196294,196359-196362,196369,196391,196456,196493,196508,196532-196533,196535,196538,196588,196611,196637-196638,196658,196668,196725,196735,196751,196755
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195136,195138,195148,195152,195156-195157,195161-195162,195193,195272,195317-195318,195327,195330,195333,195339,195343,195355,195364,195379,195397-195399,195401,195408,195421,195423-195424,195432,195439,195444,195455-195456,195469,195476-195477,195479,195491-195495,195504-195505,195514,195528,195535,195547,195567,195573-195576,195590-195591,195599,195632,195635-195636,195670,195677,195679,195682,195684,195713,195716,195769,195773,195779,195782,195787-195788,195791,195803,195812,195827,195834,195843-195844,195878-195881,195887,195903,195905,195912,195915,195932,195936-195943,195972-195973,195975-195976,196004,196044-196046,196069,196100,196104,196129,196144,196151,196153,196156,196158,196172,196189-196192,196198-196199,196208-196211,196261,196267,196269,196294,196359-196362,196369,196391,196456,196493,196508,196532-196533,196535,196538,196588,196611,196637-196638,196658,196668,196725,196735,196751,196755

Modified: llvm/branches/release_34/include/llvm/DebugInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/include/llvm/DebugInfo.h?rev=196823&r1=196822&r2=196823&view=diff
==============================================================================
--- llvm/branches/release_34/include/llvm/DebugInfo.h (original)
+++ llvm/branches/release_34/include/llvm/DebugInfo.h Mon Dec  9 15:07:27 2013
@@ -759,8 +759,8 @@ DITypeIdentifierMap generateDITypeIdenti
 /// Return true if module is modified.
 bool StripDebugInfo(Module &M);
 
-/// Return Debug Info Version by checking module flags.
-unsigned getDebugInfoVersionFromModule(const Module &M);
+/// Return Debug Info Metadata Version by checking module flags.
+unsigned getDebugMetadataVersionFromModule(const Module &M);
 
 /// DebugInfoFinder tries to list all debug info MDNodes used in a module. To
 /// list debug info MDNodes used by an instruction, DebugInfoFinder uses

Modified: llvm/branches/release_34/lib/IR/AutoUpgrade.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/IR/AutoUpgrade.cpp?rev=196823&r1=196822&r2=196823&view=diff
==============================================================================
--- llvm/branches/release_34/lib/IR/AutoUpgrade.cpp (original)
+++ llvm/branches/release_34/lib/IR/AutoUpgrade.cpp Mon Dec  9 15:07:27 2013
@@ -494,7 +494,7 @@ Value *llvm::UpgradeBitCastExpr(unsigned
 /// Check the debug info version number, if it is out-dated, drop the debug
 /// info. Return true if module is modified.
 bool llvm::UpgradeDebugInfo(Module &M) {
-  if (getDebugInfoVersionFromModule(M) == DEBUG_METADATA_VERSION)
+  if (getDebugMetadataVersionFromModule(M) == DEBUG_METADATA_VERSION)
     return false;
 
   return StripDebugInfo(M);

Modified: llvm/branches/release_34/lib/IR/DebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/IR/DebugInfo.cpp?rev=196823&r1=196822&r2=196823&view=diff
==============================================================================
--- llvm/branches/release_34/lib/IR/DebugInfo.cpp (original)
+++ llvm/branches/release_34/lib/IR/DebugInfo.cpp Mon Dec  9 15:07:27 2013
@@ -1479,8 +1479,8 @@ bool llvm::StripDebugInfo(Module &M) {
   return Changed;
 }
 
-/// Return Debug Info Version by checking module flags.
-unsigned llvm::getDebugInfoVersionFromModule(const Module &M) {
+/// Return Debug Info Metadata Version by checking module flags.
+unsigned llvm::getDebugMetadataVersionFromModule(const Module &M) {
   Value *Val = M.getModuleFlag("Debug Info Version");
   if (!Val)
     return 0;