| 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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 } else if (value->IsHeapNumber()) { | 354 } else if (value->IsHeapNumber()) { |
| 355 result = HType::HeapNumber(); | 355 result = HType::HeapNumber(); |
| 356 } else if (value->IsString()) { | 356 } else if (value->IsString()) { |
| 357 result = HType::String(); | 357 result = HType::String(); |
| 358 } else if (value->IsBoolean()) { | 358 } else if (value->IsBoolean()) { |
| 359 result = HType::Boolean(); | 359 result = HType::Boolean(); |
| 360 } else if (value->IsJSObject()) { | 360 } else if (value->IsJSObject()) { |
| 361 result = HType::JSObject(); | 361 result = HType::JSObject(); |
| 362 } else if (value->IsJSArray()) { | 362 } else if (value->IsJSArray()) { |
| 363 result = HType::JSArray(); | 363 result = HType::JSArray(); |
| 364 } else if (value->IsHeapObject()) { |
| 365 // TODO(bmeurer): This is currently a work-around until the new type system |
| 366 // is in place, where we have more precise types. |
| 367 result = HType::NonPrimitive(); |
| 364 } | 368 } |
| 365 return result; | 369 return result; |
| 366 } | 370 } |
| 367 | 371 |
| 368 | 372 |
| 369 bool HValue::IsDefinedAfter(HBasicBlock* other) const { | 373 bool HValue::IsDefinedAfter(HBasicBlock* other) const { |
| 370 return block()->block_id() > other->block_id(); | 374 return block()->block_id() > other->block_id(); |
| 371 } | 375 } |
| 372 | 376 |
| 373 | 377 |
| (...skipping 4042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4416 break; | 4420 break; |
| 4417 case kExternalMemory: | 4421 case kExternalMemory: |
| 4418 stream->Add("[external-memory]"); | 4422 stream->Add("[external-memory]"); |
| 4419 break; | 4423 break; |
| 4420 } | 4424 } |
| 4421 | 4425 |
| 4422 stream->Add("@%d", offset()); | 4426 stream->Add("@%d", offset()); |
| 4423 } | 4427 } |
| 4424 | 4428 |
| 4425 } } // namespace v8::internal | 4429 } } // namespace v8::internal |
| OLD | NEW |