Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2006-2008 the V8 project authors. All rights reserved. | 1 // Copyright 2006-2008 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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 475 Call(Top::instantiate_fun(), Top::builtins(), 1, args, exc); | 475 Call(Top::instantiate_fun(), Top::builtins(), 1, args, exc); |
| 476 if (*exc) return Handle<JSFunction>::null(); | 476 if (*exc) return Handle<JSFunction>::null(); |
| 477 return Handle<JSFunction>::cast(result); | 477 return Handle<JSFunction>::cast(result); |
| 478 } | 478 } |
| 479 | 479 |
| 480 | 480 |
| 481 Handle<JSObject> Execution::InstantiateObject(Handle<ObjectTemplateInfo> data, | 481 Handle<JSObject> Execution::InstantiateObject(Handle<ObjectTemplateInfo> data, |
| 482 bool* exc) { | 482 bool* exc) { |
| 483 if (data->property_list()->IsUndefined() && | 483 if (data->property_list()->IsUndefined() && |
| 484 !data->constructor()->IsUndefined()) { | 484 !data->constructor()->IsUndefined()) { |
| 485 Object* result; | 485 // Initialization to make gcc happy. |
| 486 Object* result = 0; | |
|
Søren Thygesen Gjesse
2009/03/23 10:50:36
0 -> NULL.
| |
| 486 { | 487 { |
| 487 HandleScope scope; | 488 HandleScope scope; |
| 488 Handle<FunctionTemplateInfo> cons_template = | 489 Handle<FunctionTemplateInfo> cons_template = |
| 489 Handle<FunctionTemplateInfo>( | 490 Handle<FunctionTemplateInfo>( |
| 490 FunctionTemplateInfo::cast(data->constructor())); | 491 FunctionTemplateInfo::cast(data->constructor())); |
| 491 Handle<JSFunction> cons = InstantiateFunction(cons_template, exc); | 492 Handle<JSFunction> cons = InstantiateFunction(cons_template, exc); |
| 492 if (*exc) return Handle<JSObject>::null(); | 493 if (*exc) return Handle<JSObject>::null(); |
| 493 Handle<Object> value = New(cons, 0, NULL, exc); | 494 Handle<Object> value = New(cons, 0, NULL, exc); |
| 494 if (*exc) return Handle<JSObject>::null(); | 495 if (*exc) return Handle<JSObject>::null(); |
| 495 result = *value; | 496 result = *value; |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 627 // All allocation spaces other than NEW_SPACE have the same effect. | 628 // All allocation spaces other than NEW_SPACE have the same effect. |
| 628 Heap::CollectGarbage(0, OLD_DATA_SPACE); | 629 Heap::CollectGarbage(0, OLD_DATA_SPACE); |
| 629 return v8::Undefined(); | 630 return v8::Undefined(); |
| 630 } | 631 } |
| 631 | 632 |
| 632 | 633 |
| 633 static GCExtension kGCExtension; | 634 static GCExtension kGCExtension; |
| 634 v8::DeclareExtension kGCExtensionDeclaration(&kGCExtension); | 635 v8::DeclareExtension kGCExtensionDeclaration(&kGCExtension); |
| 635 | 636 |
| 636 } } // namespace v8::internal | 637 } } // namespace v8::internal |
| OLD | NEW |