| OLD | NEW |
|---|
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 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 2743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2754 RegisterEnvironmentForDeoptimization(environment); | 2754 RegisterEnvironmentForDeoptimization(environment); |
| 2755 ASSERT(osr_pc_offset_ == -1); | 2755 ASSERT(osr_pc_offset_ == -1); |
| 2756 osr_pc_offset_ = masm()->pc_offset(); | 2756 osr_pc_offset_ = masm()->pc_offset(); |
| 2757 } | 2757 } |
| 2758 | 2758 |
| 2759 #undef __ | 2759 #undef __ |
| 2760 | 2760 |
| 2761 } } // namespace v8::internal | 2761 } } // namespace v8::internal |
| 2762 | 2762 |
| 2763 #endif // V8_TARGET_ARCH_X64 | 2763 #endif // V8_TARGET_ARCH_X64 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6529032:
Merge 6168:6800 from bleeding_edge to experimental/gc branch. (Closed)
Base URL: http://v8.googlecode.com/svn/branches/experimental/gc/