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

Side by Side Diff: src/heap.cc

Issue 23435006: Revert "Use trampoline or handlified JSObject::SetLocalPropertyIgnoreAttributes". (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 3 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/accessors.cc ('k') | src/objects.h » ('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 4353 matching lines...) Expand 10 before | Expand all | Expand 10 after
4364 MaybeObject* maybe_map = object_function->initial_map()->Copy(); 4364 MaybeObject* maybe_map = object_function->initial_map()->Copy();
4365 if (!maybe_map->To(&new_map)) return maybe_map; 4365 if (!maybe_map->To(&new_map)) return maybe_map;
4366 } 4366 }
4367 4367
4368 Object* prototype; 4368 Object* prototype;
4369 MaybeObject* maybe_prototype = AllocateJSObjectFromMap(new_map); 4369 MaybeObject* maybe_prototype = AllocateJSObjectFromMap(new_map);
4370 if (!maybe_prototype->ToObject(&prototype)) return maybe_prototype; 4370 if (!maybe_prototype->ToObject(&prototype)) return maybe_prototype;
4371 4371
4372 if (!function->shared()->is_generator()) { 4372 if (!function->shared()->is_generator()) {
4373 MaybeObject* maybe_failure = 4373 MaybeObject* maybe_failure =
4374 JSObject::cast(prototype)->SetLocalPropertyIgnoreAttributesTrampoline( 4374 JSObject::cast(prototype)->SetLocalPropertyIgnoreAttributes(
4375 constructor_string(), function, DONT_ENUM); 4375 constructor_string(), function, DONT_ENUM);
4376 if (maybe_failure->IsFailure()) return maybe_failure; 4376 if (maybe_failure->IsFailure()) return maybe_failure;
4377 } 4377 }
4378 4378
4379 return prototype; 4379 return prototype;
4380 } 4380 }
4381 4381
4382 4382
4383 MaybeObject* Heap::AllocateFunction(Map* function_map, 4383 MaybeObject* Heap::AllocateFunction(Map* function_map,
4384 SharedFunctionInfo* shared, 4384 SharedFunctionInfo* shared,
(...skipping 3717 matching lines...) Expand 10 before | Expand all | Expand 10 after
8102 if (FLAG_concurrent_recompilation) { 8102 if (FLAG_concurrent_recompilation) {
8103 heap_->relocation_mutex_->Lock(); 8103 heap_->relocation_mutex_->Lock();
8104 #ifdef DEBUG 8104 #ifdef DEBUG
8105 heap_->relocation_mutex_locked_by_optimizer_thread_ = 8105 heap_->relocation_mutex_locked_by_optimizer_thread_ =
8106 heap_->isolate()->optimizing_compiler_thread()->IsOptimizerThread(); 8106 heap_->isolate()->optimizing_compiler_thread()->IsOptimizerThread();
8107 #endif // DEBUG 8107 #endif // DEBUG
8108 } 8108 }
8109 } 8109 }
8110 8110
8111 } } // namespace v8::internal 8111 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/accessors.cc ('k') | src/objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698