[lld] r194911 - Use early continue.

Rui Ueyama ruiu at google.com
Fri Nov 15 17:14:37 PST 2013


Author: ruiu
Date: Fri Nov 15 19:14:37 2013
New Revision: 194911

URL: http://llvm.org/viewvc/llvm-project?rev=194911&view=rev
Log:
Use early continue.

Modified:
    lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp

Modified: lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp?rev=194911&r1=194910&r2=194911&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp (original)
+++ lld/trunk/lib/ReaderWriter/Native/WriterNative.cpp Fri Nov 15 19:14:37 2013
@@ -416,38 +416,34 @@ private:
       const Atom* atom = it.first;
       uint32_t targetIndex = it.second;
       assert(targetIndex < maxTargetIndex);
-      uint32_t atomIndex = 0;
+
       TargetToIndex::iterator pos = _definedAtomIndex.find(atom);
-      if ( pos != _definedAtomIndex.end() ) {
-        atomIndex = pos->second;
+      if (pos != _definedAtomIndex.end()) {
+        targetIndexes[targetIndex] = pos->second;
+        continue;
       }
-      else {
-        pos = _undefinedAtomIndex.find(atom);
-        if ( pos != _undefinedAtomIndex.end() ) {
-          atomIndex = pos->second + _definedAtomIvars.size();
-        }
-        else {
-          pos = _sharedLibraryAtomIndex.find(atom);
-          if ( pos != _sharedLibraryAtomIndex.end() ) {
-            assert(pos != _sharedLibraryAtomIndex.end());
-            atomIndex = pos->second
-                      + _definedAtomIvars.size()
-                      + _undefinedAtomIndex.size();
-          }
-          else {
-            pos = _absoluteAtomIndex.find(atom);
-            assert(pos != _absoluteAtomIndex.end());
-            atomIndex = pos->second
-                      + _definedAtomIvars.size()
-                      + _undefinedAtomIndex.size()
-                      + _sharedLibraryAtomIndex.size();
-         }
-        }
+      uint32_t base = _definedAtomIvars.size();
+
+      pos = _undefinedAtomIndex.find(atom);
+      if (pos != _undefinedAtomIndex.end()) {
+        targetIndexes[targetIndex] = pos->second + base;
+        continue;
       }
-      targetIndexes[targetIndex] = atomIndex;
+      base += _undefinedAtomIndex.size();
+
+      pos = _sharedLibraryAtomIndex.find(atom);
+      if (pos != _sharedLibraryAtomIndex.end()) {
+        targetIndexes[targetIndex] = pos->second + base;
+        continue;
+      }
+      base += _sharedLibraryAtomIndex.size();
+
+      pos = _absoluteAtomIndex.find(atom);
+      assert(pos != _absoluteAtomIndex.end());
+      targetIndexes[targetIndex] = pos->second + base;
     }
     // write table
-    out.write((char*)&targetIndexes[0], maxTargetIndex*sizeof(uint32_t));
+    out.write((char*)&targetIndexes[0], maxTargetIndex * sizeof(uint32_t));
   }
 
   uint32_t getAddendIndex(Reference::Addend addend) {





More information about the llvm-commits mailing list