Remove calls to JSObject::SetLocalPropertyIgnoreAttributesTrampoline within objects.cc

test/cctest/test-dictionary.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 157 matching lines @@
   key_obj->SetHiddenValue(v8_str("key 1"), v8_str("val 1"));
   key_obj->SetHiddenValue(v8_str("key 2"), v8_str("val 2"));
   key_obj->SetHiddenValue(v8_str("key 3"), v8_str("val 3"));
 
   // Simulate a full heap so that generating an identity hash code
   // in subsequent calls will request GC.
   SimulateFullSpace(CcTest::heap()->new_space());
   SimulateFullSpace(CcTest::heap()->old_pointer_space());
 
   // Calling Contains() should not cause GC ever.
-  CHECK(!table->Contains(*key));
+  int gc_count = isolate->heap()->gc_count();

[rafaelw, 2013/10/29 19:14:51]

I just took a guess at how to address this test.

[Michael Starzinger, 2013/11/04 10:29:11]

Yes, I think using the GC-count makes sense.

+  CHECK(!ObjectHashSet::Contains(table, key));
+  CHECK(gc_count == isolate->heap()->gc_count());
 
   // Calling Remove() should not cause GC ever.

[rafaelw, 2013/10/29 19:14:51]

This comment doesn't seem true. I believe it's always true for this test, but
Remove() can clearly allocate more memory via Shrink.

[Michael Starzinger, 2013/11/04 10:29:11]

You are right, the comment only holds for a HashSet of this particular size.
Maybe we should adapt the comment accordingly.

[rafaelw, 2013/11/04 15:12:01]

Done.

-  CHECK(!table->Remove(*key)->IsFailure());
+  table = ObjectHashSet::Remove(table, key);
+  CHECK(gc_count == isolate->heap()->gc_count());
 
-  // Calling Add() should request GC by returning a failure.
-  CHECK(table->Add(*key)->IsRetryAfterGC());
+  // Calling Add() should cause GC.
+  table = ObjectHashSet::Add(table, key);
+  CHECK(gc_count < isolate->heap()->gc_count());
 }
 #endif
 
 
 #ifdef DEBUG
 TEST(ObjectHashTableCausesGC) {
   i::FLAG_stress_compaction = false;
   LocalContext context;
   Isolate* isolate = CcTest::i_isolate();
   Factory* factory = isolate->factory();
@@ skipping 12 matching lines @@
   SimulateFullSpace(CcTest::heap()->new_space());
   SimulateFullSpace(CcTest::heap()->old_pointer_space());
 
   // Calling Lookup() should not cause GC ever.
   CHECK(table->Lookup(*key)->IsTheHole());
 
   // Calling Put() should request GC by returning a failure.
   CHECK(table->Put(*key, *key)->IsRetryAfterGC());
 }
 #endif