OLD | NEW |
1 // Copyright 2010 the V8 project authors. All rights reserved. | 1 // Copyright 2010 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 600 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
611 } | 611 } |
612 } | 612 } |
613 | 613 |
614 | 614 |
615 bool Call::ComputeGlobalTarget(Handle<GlobalObject> global, | 615 bool Call::ComputeGlobalTarget(Handle<GlobalObject> global, |
616 Handle<String> name) { | 616 Handle<String> name) { |
617 target_ = Handle<JSFunction>::null(); | 617 target_ = Handle<JSFunction>::null(); |
618 cell_ = Handle<JSGlobalPropertyCell>::null(); | 618 cell_ = Handle<JSGlobalPropertyCell>::null(); |
619 LookupResult lookup; | 619 LookupResult lookup; |
620 global->Lookup(*name, &lookup); | 620 global->Lookup(*name, &lookup); |
621 if (lookup.IsProperty() && lookup.type() == NORMAL) { | 621 if (lookup.IsProperty() && |
| 622 lookup.type() == NORMAL && |
| 623 lookup.holder() == *global) { |
622 cell_ = Handle<JSGlobalPropertyCell>(global->GetPropertyCell(&lookup)); | 624 cell_ = Handle<JSGlobalPropertyCell>(global->GetPropertyCell(&lookup)); |
623 if (cell_->value()->IsJSFunction()) { | 625 if (cell_->value()->IsJSFunction()) { |
624 Handle<JSFunction> candidate(JSFunction::cast(cell_->value())); | 626 Handle<JSFunction> candidate(JSFunction::cast(cell_->value())); |
625 // If the function is in new space we assume it's more likely to | 627 // If the function is in new space we assume it's more likely to |
626 // change and thus prefer the general IC code. | 628 // change and thus prefer the general IC code. |
627 if (!Heap::InNewSpace(*candidate) && | 629 if (!Heap::InNewSpace(*candidate) && |
628 CanCallWithoutIC(candidate, arguments()->length())) { | 630 CanCallWithoutIC(candidate, arguments()->length())) { |
629 target_ = candidate; | 631 target_ = candidate; |
630 return true; | 632 return true; |
631 } | 633 } |
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1056 | 1058 |
1057 CaseClause::CaseClause(Expression* label, | 1059 CaseClause::CaseClause(Expression* label, |
1058 ZoneList<Statement*>* statements, | 1060 ZoneList<Statement*>* statements, |
1059 int pos) | 1061 int pos) |
1060 : label_(label), | 1062 : label_(label), |
1061 statements_(statements), | 1063 statements_(statements), |
1062 position_(pos), | 1064 position_(pos), |
1063 compare_type_(NONE) {} | 1065 compare_type_(NONE) {} |
1064 | 1066 |
1065 } } // namespace v8::internal | 1067 } } // namespace v8::internal |
OLD | NEW |