commit f96b21728e8b10e2060ad2d0de46fcacf5974260
author Brian Carlstrom <bdc@google.com> Mon Aug 19 18:09:55 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Aug 19 18:09:55 2013 -0700
tree 37945bf749bb39078e4f4f24e1ea375a99d9d553
parent 6a94caa048121858ee8e71f84caf7b9ae1f940df

Tolerate both old and new java.util.concurrent.ConcurrentHashMap

Change-Id: I87397bbb662d7dd8cb0683fc08bd35b401034357

compiler/driver/compiler_driver.cc

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 120f232..7b83e40 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -1947,6 +1947,7 @@
   "Ljava/util/SimpleTimeZone;",  // Sub-class of TimeZone.
   "Ljava/util/TimeZone;",  // Calls regex.Pattern.compile -..-> regex.Pattern.compileImpl.
   "Ljava/util/concurrent/ConcurrentHashMap;",  // Calls Runtime.getRuntime().availableProcessors().
+  "Ljava/util/concurrent/ConcurrentHashMap$Segment;",  // Calls Runtime.getRuntime().availableProcessors().
   "Ljava/util/concurrent/ConcurrentSkipListMap;",  // Calls Random() -> OsConstants.initConstants.
   "Ljava/util/concurrent/Exchanger;",  // Calls Runtime.getRuntime().availableProcessors().
   "Ljava/util/concurrent/ForkJoinPool;",  // Makes a thread pool ..-> calls OsConstants.initConstants.