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

Side by Side Diff: src/handles-inl.h

Issue 113409: Modify assert so it doesn't crash when 'location' is NULL.... (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 11 years, 7 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2006-2008 the V8 project authors. All rights reserved. 1 // Copyright 2006-2008 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 26 matching lines...) Expand all
37 37
38 template<class T> 38 template<class T>
39 Handle<T>::Handle(T* obj) { 39 Handle<T>::Handle(T* obj) {
40 ASSERT(!obj->IsFailure()); 40 ASSERT(!obj->IsFailure());
41 location_ = reinterpret_cast<T**>(HandleScope::CreateHandle(obj)); 41 location_ = reinterpret_cast<T**>(HandleScope::CreateHandle(obj));
42 } 42 }
43 43
44 44
45 template <class T> 45 template <class T>
46 inline T* Handle<T>::operator*() const { 46 inline T* Handle<T>::operator*() const {
47 ASSERT(location_ != NULL); 47 ASSERT(location_ != NULL &&
48 ASSERT(reinterpret_cast<Address>(*location_) != kHandleZapValue); 48 reinterpret_cast<Address>(*location_) != kHandleZapValue);
49 return *location_; 49 return *location_;
50 } 50 }
51 51
52 52
53 #ifdef DEBUG 53 #ifdef DEBUG
54 inline NoHandleAllocation::NoHandleAllocation() { 54 inline NoHandleAllocation::NoHandleAllocation() {
55 v8::ImplementationUtilities::HandleScopeData* current = 55 v8::ImplementationUtilities::HandleScopeData* current =
56 v8::ImplementationUtilities::CurrentHandleScope(); 56 v8::ImplementationUtilities::CurrentHandleScope();
57 extensions_ = current->extensions; 57 extensions_ = current->extensions;
58 // Shrink the current handle scope to make it impossible to do 58 // Shrink the current handle scope to make it impossible to do
59 // handle allocations without an explicit handle scope. 59 // handle allocations without an explicit handle scope.
60 current->limit = current->next; 60 current->limit = current->next;
61 current->extensions = -1; 61 current->extensions = -1;
62 } 62 }
63 63
64 64
65 inline NoHandleAllocation::~NoHandleAllocation() { 65 inline NoHandleAllocation::~NoHandleAllocation() {
66 // Restore state in current handle scope to re-enable handle 66 // Restore state in current handle scope to re-enable handle
67 // allocations. 67 // allocations.
68 v8::ImplementationUtilities::CurrentHandleScope()->extensions = extensions_; 68 v8::ImplementationUtilities::CurrentHandleScope()->extensions = extensions_;
69 } 69 }
70 #endif 70 #endif
71 71
72 72
73 } } // namespace v8::internal 73 } } // namespace v8::internal
74 74
75 #endif // V8_HANDLES_INL_H_ 75 #endif // V8_HANDLES_INL_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698