commit e9b02d68f48030a6306c0bf6b37c17ee2f375ab1
author Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 21 22:33:02 2016 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Mon Mar 21 22:33:02 2016 +0000
tree bb257d8a6efcb5daa0e4bb4e264ab166518db76b
parent bd4dc69308f426cfee3001c0dec612c96e6133d7

[modules] Store mangling numbers in a deterministic order so they don't cause the resulting .pcm files to be nondeterministic.

llvm-svn: 263996

clang/lib/AST/ASTContext.cpp

diff --git a/clang/lib/AST/ASTContext.cpp b/clang/lib/AST/ASTContext.cpp
index cd0eada..5fb94e1 100644
--- a/clang/lib/AST/ASTContext.cpp
+++ b/clang/lib/AST/ASTContext.cpp
@@ -8684,8 +8684,7 @@
 }
 
 unsigned ASTContext::getManglingNumber(const NamedDecl *ND) const {
-  llvm::DenseMap<const NamedDecl *, unsigned>::const_iterator I =
-    MangleNumbers.find(ND);
+  auto I = MangleNumbers.find(ND);
   return I != MangleNumbers.end() ? I->second : 1;
 }
 
@@ -8695,8 +8694,7 @@
 }
 
 unsigned ASTContext::getStaticLocalNumber(const VarDecl *VD) const {
-  llvm::DenseMap<const VarDecl *, unsigned>::const_iterator I =
-      StaticLocalNumbers.find(VD);
+  auto I = StaticLocalNumbers.find(VD);
   return I != StaticLocalNumbers.end() ? I->second : 1;
 }