commit 64f884de66d0eb888a215e276f9b10ade0690413
author Logan Chien <loganchien@google.com> Tue Apr 03 18:30:47 2012 +0800
committer Shih-wei Liao <sliao@google.com> Tue Apr 03 22:26:02 2012 -0700
tree 85a42b14c2b9937dd64764b9eb7154846f60a39e
parent 4855cd516d97c9728fa58312acdf6c4b8b81397a

Fix compiler runtime function lookup bug.

Change-Id: I9bfa60fd60a5d606c176c05ea849d6b3c634bd0c

src/compiler_llvm/runtime_support_llvm.cc

diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc
index 59b8efb..7349647 100644
--- a/src/compiler_llvm/runtime_support_llvm.cc
+++ b/src/compiler_llvm/runtime_support_llvm.cc
@@ -446,7 +446,7 @@
 class CStringComparator {
  public:
   bool operator()(const char* lhs, const char* rhs) const {
-    return (strcmp(lhs, rhs) <= 0);
+    return (strcmp(lhs, rhs) < 0);
   }
 };
 
@@ -477,13 +477,16 @@
 
   static const size_t num_entries = sizeof(names) / sizeof(const char* const);
 
-  const char* const* matched_name_ptr =
-      std::lower_bound(names, names + num_entries, name, CStringComparator());
+  const char* const* const names_begin = names;
+  const char* const* const names_end = names + num_entries;
 
-  if (matched_name_ptr == names + num_entries) {
-    return NULL;
+  const char* const* name_lbound_ptr =
+      std::lower_bound(names_begin, names_end, name, CStringComparator());
+
+  if (name_lbound_ptr < names_end && strcmp(*name_lbound_ptr, name) == 0) {
+    return funcs[name_lbound_ptr - names_begin];
   } else {
-    return funcs[matched_name_ptr - names];
+    return NULL;
   }
 }