OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 10041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
10052 | 10052 |
10053 AddStore(object_properties, access, value_instruction); | 10053 AddStore(object_properties, access, value_instruction); |
10054 } | 10054 } |
10055 } | 10055 } |
10056 | 10056 |
10057 int inobject_properties = boilerplate_object->map()->inobject_properties(); | 10057 int inobject_properties = boilerplate_object->map()->inobject_properties(); |
10058 HInstruction* value_instruction = AddInstruction(new(zone) | 10058 HInstruction* value_instruction = AddInstruction(new(zone) |
10059 HConstant(isolate()->factory()->one_pointer_filler_map(), | 10059 HConstant(isolate()->factory()->one_pointer_filler_map(), |
10060 Representation::Tagged())); | 10060 Representation::Tagged())); |
10061 for (int i = copied_fields; i < inobject_properties; i++) { | 10061 for (int i = copied_fields; i < inobject_properties; i++) { |
10062 HObjectAccess access = HObjectAccess::ForJSObjectOffset(i); | 10062 ASSERT(boilerplate_object->IsJSObject()); |
| 10063 int property_offset = boilerplate_object->GetInObjectPropertyOffset(i); |
| 10064 HObjectAccess access = HObjectAccess::ForJSObjectOffset(property_offset); |
10063 AddStore(object_properties, access, value_instruction); | 10065 AddStore(object_properties, access, value_instruction); |
10064 } | 10066 } |
10065 } | 10067 } |
10066 | 10068 |
10067 | 10069 |
10068 void HOptimizedGraphBuilder::BuildEmitElements( | 10070 void HOptimizedGraphBuilder::BuildEmitElements( |
10069 Handle<FixedArrayBase> elements, | 10071 Handle<FixedArrayBase> elements, |
10070 Handle<FixedArrayBase> original_elements, | 10072 Handle<FixedArrayBase> original_elements, |
10071 ElementsKind kind, | 10073 ElementsKind kind, |
10072 HValue* object_elements, | 10074 HValue* object_elements, |
(...skipping 1423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
11496 } | 11498 } |
11497 } | 11499 } |
11498 | 11500 |
11499 #ifdef DEBUG | 11501 #ifdef DEBUG |
11500 if (graph_ != NULL) graph_->Verify(false); // No full verify. | 11502 if (graph_ != NULL) graph_->Verify(false); // No full verify. |
11501 if (allocator_ != NULL) allocator_->Verify(); | 11503 if (allocator_ != NULL) allocator_->Verify(); |
11502 #endif | 11504 #endif |
11503 } | 11505 } |
11504 | 11506 |
11505 } } // namespace v8::internal | 11507 } } // namespace v8::internal |
OLD | NEW |