--- a/src/share/vm/ci/ciObjectFactory.cpp	Mon Feb 27 16:26:41 2012 +0100
+++ b/src/share/vm/ci/ciObjectFactory.cpp	Mon Feb 27 17:06:18 2012 +0100
@@ -87,10 +87,11 @@
   _ci_objects = new (arena) GrowableArray<ciObject*>(arena, expected_size, 0, NULL);
 
   // If the shared ci objects exist append them to this factory's objects
-
-  /*if (_shared_ci_objects != NULL) {
+#ifndef GRAAL
+  if (_shared_ci_objects != NULL) {
     _ci_objects->appendAll(_shared_ci_objects);
-  }*/
+  }
+#endif
 
   _unloaded_methods = new (arena) GrowableArray<ciMethod*>(arena, 4, 0, NULL);
   _unloaded_klasses = new (arena) GrowableArray<ciKlass*>(arena, 8, 0, NULL);
@@ -219,15 +220,16 @@
 
 
 ciSymbol* ciObjectFactory::get_symbol(Symbol* key) {
-  /*vmSymbols::SID sid = vmSymbols::find_sid(key);
+#ifndef GRAAL
+  vmSymbols::SID sid = vmSymbols::find_sid(key);
   if (sid != vmSymbols::NO_SID) {
     // do not pollute the main cache with it
-    ciSymbol* result = vm_symbol_at(sid);
-    assert(result != NULL, "");
-    return result;
-  }*/
+    return vm_symbol_at(sid);
+  }
 
-  //assert(vmSymbols::find_sid(key) == vmSymbols::NO_SID, "");
+  assert(vmSymbols::find_sid(key) == vmSymbols::NO_SID, "");
+#endif
+
   ciSymbol* s = new (arena()) ciSymbol(key, vmSymbols::NO_SID);
   _symbols->push(s);
   return s;