Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Side by Side Diff: src/arm/deoptimizer-arm.cc

Issue 184373004: Fail early when re-entering code that has been patched for lazy deopt (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: cover OSR entry too Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/a64/deoptimizer-a64.cc ('k') | src/ia32/deoptimizer-ia32.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 return kCallInstructionSizeInWords * Assembler::kInstrSize; 43 return kCallInstructionSizeInWords * Assembler::kInstrSize;
44 } 44 }
45 45
46 46
47 void Deoptimizer::PatchCodeForDeoptimization(Isolate* isolate, Code* code) { 47 void Deoptimizer::PatchCodeForDeoptimization(Isolate* isolate, Code* code) {
48 Address code_start_address = code->instruction_start(); 48 Address code_start_address = code->instruction_start();
49 // Invalidate the relocation information, as it will become invalid by the 49 // Invalidate the relocation information, as it will become invalid by the
50 // code patching below, and is not needed any more. 50 // code patching below, and is not needed any more.
51 code->InvalidateRelocation(); 51 code->InvalidateRelocation();
52 52
53 if (FLAG_zap_code_space) {
54 // Fail hard and early if we enter this code object again.
55 byte* pointer = code->FindCodeAgeSequence();
56 if (pointer != NULL) {
57 pointer += kNoCodeAgeSequenceLength;
58 } else {
59 pointer = code->instruction_start();
60 }
61 CodePatcher patcher(pointer, 1);
62 patcher.masm()->bkpt(0);
63
64 DeoptimizationInputData* data =
65 DeoptimizationInputData::cast(code->deoptimization_data());
66 int osr_offset = data->OsrPcOffset()->value();
67 if (osr_offset > 0) {
68 CodePatcher osr_patcher(code->instruction_start() + osr_offset, 1);
69 osr_patcher.masm()->bkpt(0);
70 }
71 }
72
53 // For each LLazyBailout instruction insert a call to the corresponding 73 // For each LLazyBailout instruction insert a call to the corresponding
54 // deoptimization entry. 74 // deoptimization entry.
55 DeoptimizationInputData* deopt_data = 75 DeoptimizationInputData* deopt_data =
56 DeoptimizationInputData::cast(code->deoptimization_data()); 76 DeoptimizationInputData::cast(code->deoptimization_data());
57 #ifdef DEBUG 77 #ifdef DEBUG
58 Address prev_call_address = NULL; 78 Address prev_call_address = NULL;
59 #endif 79 #endif
60 for (int i = 0; i < deopt_data->DeoptCount(); i++) { 80 for (int i = 0; i < deopt_data->DeoptCount(); i++) {
61 if (deopt_data->Pc(i)->value() == -1) continue; 81 if (deopt_data->Pc(i)->value() == -1) continue;
62 Address call_address = code_start_address + deopt_data->Pc(i)->value(); 82 Address call_address = code_start_address + deopt_data->Pc(i)->value();
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 366
347 367
348 void FrameDescription::SetCallerFp(unsigned offset, intptr_t value) { 368 void FrameDescription::SetCallerFp(unsigned offset, intptr_t value) {
349 SetFrameSlot(offset, value); 369 SetFrameSlot(offset, value);
350 } 370 }
351 371
352 372
353 #undef __ 373 #undef __
354 374
355 } } // namespace v8::internal 375 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/a64/deoptimizer-a64.cc ('k') | src/ia32/deoptimizer-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698