<div dir="ltr">Nitpicky, but the mix of camel case and underscore (Arm_Kinds) looks odd. Can we rename ArmKinds?</div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Feb 15, 2015 at 7:23 AM, Jean-Daniel Dupas <span dir="ltr"><<a href="mailto:devlists@shadowlab.org" target="_blank">devlists@shadowlab.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jddupas<br>
Date: Sun Feb 15 09:23:48 2015<br>
New Revision: 229314<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229314&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229314&view=rev</a><br>
Log:<br>
Update ARM and x86 ArchHandler to check switch completeness. NFC<br>
<br>
Define an explicit type for arch specific reference kinds to make sure all cases are covered in switch statements.<br>
<br>
<br>
Modified:<br>
    lld/trunk/lib/ReaderWriter/MachO/ArchHandler_arm.cpp<br>
    lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86.cpp<br>
    lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/MachO/ArchHandler_arm.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ArchHandler_arm.cpp?rev=229314&r1=229313&r2=229314&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ArchHandler_arm.cpp?rev=229314&r1=229313&r2=229314&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/MachO/ArchHandler_arm.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/MachO/ArchHandler_arm.cpp Sun Feb 15 09:23:48 2015<br>
@@ -138,7 +138,7 @@ private:<br>
   static const Registry::KindStrings _sKindStrings[];<br>
   static const StubInfo              _sStubInfoArmPIC;<br>
<br>
-  enum : Reference::KindValue {<br>
+  enum Arm_Kinds : Reference::KindValue {<br>
     invalid,               /// for error condition<br>
<br>
     modeThumbCode,         /// Content starting at this offset is thumb.<br>
@@ -207,6 +207,7 @@ ArchHandler_arm::ArchHandler_arm() { }<br>
 ArchHandler_arm::~ArchHandler_arm() { }<br>
<br>
 const Registry::KindStrings ArchHandler_arm::_sKindStrings[] = {<br>
+  LLD_KIND_STRING_ENTRY(invalid),<br>
   LLD_KIND_STRING_ENTRY(modeThumbCode),<br>
   LLD_KIND_STRING_ENTRY(modeArmCode),<br>
   LLD_KIND_STRING_ENTRY(modeData),<br>
@@ -912,7 +913,7 @@ void ArchHandler_arm::applyFixupFinal(co<br>
   int32_t displacement;<br>
   uint16_t value16;<br>
   uint32_t value32;<br>
-  switch (ref.kindValue()) {<br>
+  switch (static_cast<Arm_Kinds>(ref.kindValue())) {<br>
   case modeThumbCode:<br>
     thumbMode = true;<br>
     break;<br>
@@ -1068,13 +1069,16 @@ void ArchHandler_arm::applyFixupRelocata<br>
                                             uint64_t inAtomAddress,<br>
                                             bool &thumbMode,<br>
                                             bool targetIsThumb) {<br>
+  if (ref.kindNamespace() != Reference::KindNamespace::mach_o)<br>
+    return;<br>
+  assert(ref.kindArch() == Reference::KindArch::ARM);<br>
   bool useExternalReloc = useExternalRelocationTo(*ref.target());<br>
   ulittle32_t *loc32 = reinterpret_cast<ulittle32_t *>(loc);<br>
   int32_t displacement;<br>
   uint16_t value16;<br>
   uint32_t value32;<br>
   bool targetIsUndef = isa<UndefinedAtom>(ref.target());<br>
-  switch (ref.kindValue()) {<br>
+  switch (static_cast<Arm_Kinds>(ref.kindValue())) {<br>
   case modeThumbCode:<br>
     thumbMode = true;<br>
     break;<br>
@@ -1168,7 +1172,7 @@ void ArchHandler_arm::applyFixupRelocata<br>
   case lazyImmediateLocation:<br>
     // do nothing<br>
     break;<br>
-  default:<br>
+  case invalid:<br>
     llvm_unreachable("invalid ARM Reference Kind");<br>
     break;<br>
   }<br>
@@ -1190,11 +1194,10 @@ void ArchHandler_arm::appendSectionReloc<br>
   uint32_t targetAtomAddress;<br>
   uint32_t fromAtomAddress;<br>
   uint16_t other16;<br>
-  switch (ref.kindValue()) {<br>
+  switch (static_cast<Arm_Kinds>(ref.kindValue())) {<br>
   case modeThumbCode:<br>
   case modeArmCode:<br>
   case modeData:<br>
-    break;<br>
     // Do nothing.<br>
     break;<br>
   case thumb_b22:<br>
@@ -1382,7 +1385,7 @@ void ArchHandler_arm::appendSectionReloc<br>
   case lazyImmediateLocation:<br>
     // do nothing<br>
     break;<br>
-  default:<br>
+  case invalid:<br>
     llvm_unreachable("invalid ARM Reference Kind");<br>
     break;<br>
   }<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86.cpp?rev=229314&r1=229313&r2=229314&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86.cpp?rev=229314&r1=229313&r2=229314&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86.cpp Sun Feb 15 09:23:48 2015<br>
@@ -133,7 +133,7 @@ private:<br>
   static const Registry::KindStrings _sKindStrings[];<br>
   static const StubInfo              _sStubInfo;<br>
<br>
-  enum : Reference::KindValue {<br>
+  enum X86_Kinds : Reference::KindValue {<br>
     invalid,               /// for error condition<br>
<br>
     modeCode,              /// Content starting at this offset is code.<br>
@@ -441,7 +441,7 @@ void ArchHandler_x86::applyFixupFinal(co<br>
     return;<br>
   assert(ref.kindArch() == Reference::KindArch::x86);<br>
   ulittle32_t *loc32 = reinterpret_cast<ulittle32_t *>(loc);<br>
-  switch (ref.kindValue()) {<br>
+  switch (static_cast<X86_Kinds>(ref.kindValue())) {<br>
   case branch32:<br>
     *loc32 = (targetAddress - (fixupAddress + 4)) + ref.addend();<br>
     break;<br>
@@ -469,7 +469,7 @@ void ArchHandler_x86::applyFixupFinal(co<br>
   case lazyImmediateLocation:<br>
     *loc32 = ref.addend();<br>
     break;<br>
-  default:<br>
+  case invalid:<br>
     llvm_unreachable("invalid x86 Reference Kind");<br>
     break;<br>
   }<br>
@@ -480,10 +480,13 @@ void ArchHandler_x86::applyFixupRelocata<br>
                                                uint64_t fixupAddress,<br>
                                                uint64_t targetAddress,<br>
                                                uint64_t inAtomAddress) {<br>
+  if (ref.kindNamespace() != Reference::KindNamespace::mach_o)<br>
+    return;<br>
+  assert(ref.kindArch() == Reference::KindArch::x86);<br>
   bool useExternalReloc = useExternalRelocationTo(*ref.target());<br>
   ulittle16_t *loc16 = reinterpret_cast<ulittle16_t *>(loc);<br>
   ulittle32_t *loc32 = reinterpret_cast<ulittle32_t *>(loc);<br>
-  switch (ref.kindValue()) {<br>
+  switch (static_cast<X86_Kinds>(ref.kindValue())) {<br>
   case branch32:<br>
     if (useExternalReloc)<br>
       *loc32 = ref.addend() - (fixupAddress + 4);<br>
@@ -515,7 +518,7 @@ void ArchHandler_x86::applyFixupRelocata<br>
   case lazyImmediateLocation:<br>
     // do nothing<br>
     break;<br>
-  default:<br>
+  case invalid:<br>
     llvm_unreachable("invalid x86 Reference Kind");<br>
     break;<br>
   }<br>
@@ -556,7 +559,7 @@ void ArchHandler_x86::appendSectionReloc<br>
   assert(ref.kindArch() == Reference::KindArch::x86);<br>
   uint32_t sectionOffset = atomSectionOffset + ref.offsetInAtom();<br>
   bool useExternalReloc = useExternalRelocationTo(*ref.target());<br>
-  switch (ref.kindValue()) {<br>
+  switch (static_cast<X86_Kinds>(ref.kindValue())) {<br>
   case modeCode:<br>
   case modeData:<br>
     break;<br>
@@ -624,10 +627,9 @@ void ArchHandler_x86::appendSectionReloc<br>
   case lazyImmediateLocation:<br>
     llvm_unreachable("lazy reference kind implies Stubs pass was run");<br>
     break;<br>
-  default:<br>
+  case invalid:<br>
     llvm_unreachable("unknown x86 Reference Kind");<br>
     break;<br>
-<br>
   }<br>
 }<br>
<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp?rev=229314&r1=229313&r2=229314&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp?rev=229314&r1=229313&r2=229314&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp Sun Feb 15 09:23:48 2015<br>
@@ -475,11 +475,11 @@ void ArchHandler_x86_64::applyFixupFinal<br>
     const Reference &ref, uint8_t *loc, uint64_t fixupAddress,<br>
     uint64_t targetAddress, uint64_t inAtomAddress, uint64_t imageBaseAddress,<br>
     FindAddressForAtom findSectionAddress) {<br>
-  ulittle32_t *loc32 = reinterpret_cast<ulittle32_t *>(loc);<br>
-  ulittle64_t *loc64 = reinterpret_cast<ulittle64_t *>(loc);<br>
   if (ref.kindNamespace() != Reference::KindNamespace::mach_o)<br>
     return;<br>
   assert(ref.kindArch() == Reference::KindArch::x86_64);<br>
+  ulittle32_t *loc32 = reinterpret_cast<ulittle32_t *>(loc);<br>
+  ulittle64_t *loc64 = reinterpret_cast<ulittle64_t *>(loc);<br>
   switch (static_cast<X86_64_Kinds>(ref.kindValue())) {<br>
   case branch32:<br>
   case ripRel32:<br>
@@ -548,6 +548,9 @@ void ArchHandler_x86_64::applyFixupReloc<br>
                                                uint64_t fixupAddress,<br>
                                                uint64_t targetAddress,<br>
                                                uint64_t inAtomAddress)  {<br>
+  if (ref.kindNamespace() != Reference::KindNamespace::mach_o)<br>
+    return;<br>
+  assert(ref.kindArch() == Reference::KindArch::x86_64);<br>
   ulittle32_t *loc32 = reinterpret_cast<ulittle32_t *>(loc);<br>
   ulittle64_t *loc64 = reinterpret_cast<ulittle64_t *>(loc);<br>
   switch (static_cast<X86_64_Kinds>(ref.kindValue())) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>