From: Shantonu Sen <ssen@apple.com>
Date: Wed, 9 Feb 2011 21:03:19 +0000 (+0000)
Subject: Fix comparator used for looking up previously instantiated EDDisassemblers.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=80fd30563c341d6db778f407547707396ff97c75;p=oota-llvm.git

Fix comparator used for looking up previously instantiated EDDisassemblers.

Now, Syntax is only used as a tie-breaker if the Arch
matches. Previously, a request for x86_64 disassembler followed by the
i386 disassembler in a single process would return the cached x86_64
disassembler. Fixes <rdar://problem/8958982>



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

diff --git a/lib/MC/MCDisassembler/EDDisassembler.h b/lib/MC/MCDisassembler/EDDisassembler.h
index fdbe7ad24c1..71e45f0b042 100644
--- a/lib/MC/MCDisassembler/EDDisassembler.h
+++ b/lib/MC/MCDisassembler/EDDisassembler.h
@@ -89,8 +89,10 @@ struct EDDisassembler {
     bool operator<(const CPUKey &key) const {
       if(Arch > key.Arch)
         return false;
-      if(Syntax >= key.Syntax)
-        return false;
+      else if (Arch == key.Arch) {
+        if(Syntax > key.Syntax)
+          return false;
+      }
       return true;
     }
   };