| 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 3596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3607 Handle<Map> map, | 3607 Handle<Map> map, |
| 3608 Handle<String> name) { | 3608 Handle<String> name) { |
| 3609 LookupResult lookup; | 3609 LookupResult lookup; |
| 3610 map->LookupInDescriptors(NULL, *name, &lookup); | 3610 map->LookupInDescriptors(NULL, *name, &lookup); |
| 3611 if (lookup.IsProperty() && lookup.type() == FIELD) { | 3611 if (lookup.IsProperty() && lookup.type() == FIELD) { |
| 3612 return BuildLoadNamedField(obj, | 3612 return BuildLoadNamedField(obj, |
| 3613 expr, | 3613 expr, |
| 3614 map, | 3614 map, |
| 3615 &lookup, | 3615 &lookup, |
| 3616 true); | 3616 true); |
| 3617 } else if (lookup.IsProperty() && lookup.type() == CONSTANT_FUNCTION) { |
| 3618 AddInstruction(new HCheckNonSmi(obj)); |
| 3619 AddInstruction(new HCheckMap(obj, map)); |
| 3620 Handle<JSFunction> function(lookup.GetConstantFunctionFromMap(*map)); |
| 3621 return new HConstant(function, Representation::Tagged()); |
| 3617 } else { | 3622 } else { |
| 3618 return BuildLoadNamedGeneric(obj, expr); | 3623 return BuildLoadNamedGeneric(obj, expr); |
| 3619 } | 3624 } |
| 3620 } | 3625 } |
| 3621 | 3626 |
| 3622 | 3627 |
| 3623 HInstruction* HGraphBuilder::BuildLoadKeyedGeneric(HValue* object, | 3628 HInstruction* HGraphBuilder::BuildLoadKeyedGeneric(HValue* object, |
| 3624 HValue* key) { | 3629 HValue* key) { |
| 3625 return new HLoadKeyedGeneric(object, key); | 3630 return new HLoadKeyedGeneric(object, key); |
| 3626 } | 3631 } |
| (...skipping 2039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5666 } | 5671 } |
| 5667 | 5672 |
| 5668 #ifdef DEBUG | 5673 #ifdef DEBUG |
| 5669 if (graph_ != NULL) graph_->Verify(); | 5674 if (graph_ != NULL) graph_->Verify(); |
| 5670 if (chunk_ != NULL) chunk_->Verify(); | 5675 if (chunk_ != NULL) chunk_->Verify(); |
| 5671 if (allocator_ != NULL) allocator_->Verify(); | 5676 if (allocator_ != NULL) allocator_->Verify(); |
| 5672 #endif | 5677 #endif |
| 5673 } | 5678 } |
| 5674 | 5679 |
| 5675 } } // namespace v8::internal | 5680 } } // namespace v8::internal |
| OLD | NEW |