OLD | NEW |
---|---|
1 // Copyright 2014 the V8 project authors. All rights reserved. | 1 // Copyright 2014 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef V8_COMPILER_INSTRUCTION_H_ | 5 #ifndef V8_COMPILER_INSTRUCTION_H_ |
6 #define V8_COMPILER_INSTRUCTION_H_ | 6 #define V8_COMPILER_INSTRUCTION_H_ |
7 | 7 |
8 #include <deque> | 8 #include <deque> |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
482 void set_pointer_map(PointerMap* map) { | 482 void set_pointer_map(PointerMap* map) { |
483 ASSERT(NeedsPointerMap()); | 483 ASSERT(NeedsPointerMap()); |
484 ASSERT_EQ(NULL, pointer_map_); | 484 ASSERT_EQ(NULL, pointer_map_); |
485 pointer_map_ = map; | 485 pointer_map_ = map; |
486 } | 486 } |
487 | 487 |
488 // Placement new operator so that we can smash instructions into | 488 // Placement new operator so that we can smash instructions into |
489 // zone-allocated memory. | 489 // zone-allocated memory. |
490 void* operator new(size_t, void* location) { return location; } | 490 void* operator new(size_t, void* location) { return location; } |
491 | 491 |
492 void operator delete(void*, size_t) { UNREACHABLE(); } | 492 void operator delete(void* location) { UNREACHABLE(); } |
Jakob Kummerow
2014/07/30 15:03:32
I think you need:
void operator delete(void* poin
| |
493 void operator delete(void* pointer, Zone* zone) { UNREACHABLE(); } | |
494 | 493 |
495 protected: | 494 protected: |
496 explicit Instruction(InstructionCode opcode) | 495 explicit Instruction(InstructionCode opcode) |
497 : opcode_(opcode), | 496 : opcode_(opcode), |
498 bit_field_(OutputCountField::encode(0) | InputCountField::encode(0) | | 497 bit_field_(OutputCountField::encode(0) | InputCountField::encode(0) | |
499 TempCountField::encode(0) | IsCallField::encode(false) | | 498 TempCountField::encode(0) | IsCallField::encode(false) | |
500 IsControlField::encode(false)), | 499 IsControlField::encode(false)), |
501 pointer_map_(NULL) {} | 500 pointer_map_(NULL) {} |
502 | 501 |
503 Instruction(InstructionCode opcode, size_t output_count, | 502 Instruction(InstructionCode opcode, size_t output_count, |
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
837 DeoptimizationVector deoptimization_entries_; | 836 DeoptimizationVector deoptimization_entries_; |
838 }; | 837 }; |
839 | 838 |
840 OStream& operator<<(OStream& os, const InstructionSequence& code); | 839 OStream& operator<<(OStream& os, const InstructionSequence& code); |
841 | 840 |
842 } // namespace compiler | 841 } // namespace compiler |
843 } // namespace internal | 842 } // namespace internal |
844 } // namespace v8 | 843 } // namespace v8 |
845 | 844 |
846 #endif // V8_COMPILER_INSTRUCTION_H_ | 845 #endif // V8_COMPILER_INSTRUCTION_H_ |
OLD | NEW |