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

Side by Side Diff: src/handles.cc

Issue 6461022: Merge a number of assertion failure fixes to the 3.0 branch. (Closed) Base URL: http://v8.googlecode.com/svn/branches/3.0/
Patch Set: '' Created 9 years, 10 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
OLDNEW
1 // Copyright 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 bool EnsureCompiled(Handle<SharedFunctionInfo> shared, 801 bool EnsureCompiled(Handle<SharedFunctionInfo> shared,
802 ClearExceptionFlag flag) { 802 ClearExceptionFlag flag) {
803 return shared->is_compiled() || CompileLazyShared(shared, flag); 803 return shared->is_compiled() || CompileLazyShared(shared, flag);
804 } 804 }
805 805
806 806
807 static bool CompileLazyHelper(CompilationInfo* info, 807 static bool CompileLazyHelper(CompilationInfo* info,
808 ClearExceptionFlag flag) { 808 ClearExceptionFlag flag) {
809 // Compile the source information to a code object. 809 // Compile the source information to a code object.
810 ASSERT(info->IsOptimizing() || !info->shared_info()->is_compiled()); 810 ASSERT(info->IsOptimizing() || !info->shared_info()->is_compiled());
811 ASSERT(!Top::has_pending_exception());
811 bool result = Compiler::CompileLazy(info); 812 bool result = Compiler::CompileLazy(info);
812 ASSERT(result != Top::has_pending_exception()); 813 ASSERT(result != Top::has_pending_exception());
813 if (!result && flag == CLEAR_EXCEPTION) Top::clear_pending_exception(); 814 if (!result && flag == CLEAR_EXCEPTION) Top::clear_pending_exception();
814 return result; 815 return result;
815 } 816 }
816 817
817 818
818 bool CompileLazyShared(Handle<SharedFunctionInfo> shared, 819 bool CompileLazyShared(Handle<SharedFunctionInfo> shared,
819 ClearExceptionFlag flag) { 820 ClearExceptionFlag flag) {
820 CompilationInfo info(shared); 821 CompilationInfo info(shared);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 892
892 OptimizedObjectForAddingMultipleProperties:: 893 OptimizedObjectForAddingMultipleProperties::
893 ~OptimizedObjectForAddingMultipleProperties() { 894 ~OptimizedObjectForAddingMultipleProperties() {
894 // Reoptimize the object to allow fast property access. 895 // Reoptimize the object to allow fast property access.
895 if (has_been_transformed_) { 896 if (has_been_transformed_) {
896 TransformToFastProperties(object_, unused_property_fields_); 897 TransformToFastProperties(object_, unused_property_fields_);
897 } 898 }
898 } 899 }
899 900
900 } } // namespace v8::internal 901 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/full-codegen.cc ('k') | src/hydrogen.cc » ('j') | src/ia32/macro-assembler-ia32.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698