Simple style fixes.

* Use a range loop.
* Move simple continue checks earlier.
* clang-format.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223654 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 9834502a0ddb1679897a5cf81e3a95d86a468a91..fe406986fd6e5d4fd52ab9a272ef59d4ca00ccbe 100644 (file)
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -1475,27 +1475,28 @@ bool ModuleLinker::run() {
 
   // Link in the function bodies that are defined in the source module into
   // DstM.
-  for (Module::iterator SF = SrcM->begin(), E = SrcM->end(); SF != E; ++SF) {
+  for (Function &SF : *SrcM) {
+    // Skip if no body (function is external).
+    if (SF.isDeclaration())
+      continue;
+
     // Skip if not linking from source.
-    if (DoNotLinkFromSource.count(SF)) continue;
+    if (DoNotLinkFromSource.count(&SF))
+      continue;
 
-    Function *DF = cast<Function>(ValueMap[SF]);
+    Function *DF = cast<Function>(ValueMap[&SF]);
 
     // Link in the prefix data.
-    if (SF->hasPrefixData())
-      DF->setPrefixData(MapValue(
-          SF->getPrefixData(), ValueMap, RF_None, &TypeMap, &ValMaterializer));
+    if (SF.hasPrefixData())
+      DF->setPrefixData(MapValue(SF.getPrefixData(), ValueMap, RF_None,
+                                 &TypeMap, &ValMaterializer));
 
     // Link in the prologue data.
-    if (SF->hasPrologueData())
-      DF->setPrologueData(MapValue(
-          SF->getPrologueData(), ValueMap, RF_None, &TypeMap, &ValMaterializer));
+    if (SF.hasPrologueData())
+      DF->setPrologueData(MapValue(SF.getPrologueData(), ValueMap, RF_None,
+                                   &TypeMap, &ValMaterializer));
 
-    // Skip if no body (function is external).
-    if (SF->isDeclaration())
-      continue;
-
-    if (linkFunctionBody(DF, SF))
+    if (linkFunctionBody(DF, &SF))
       return true;
   }