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

Side by Side Diff: src/ic/ic-state.h

Issue 1189153002: Revert of [strong] Implement strong mode restrictions on property access (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « src/ic/ic-inl.h ('k') | src/ic/mips/handler-compiler-mips.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 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef V8_IC_STATE_H_ 5 #ifndef V8_IC_STATE_H_
6 #define V8_IC_STATE_H_ 6 #define V8_IC_STATE_H_
7 7
8 #include "src/macro-assembler.h" 8 #include "src/macro-assembler.h"
9 9
10 namespace v8 { 10 namespace v8 {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 194
195 static const char* GetStateName(CompareICState::State state); 195 static const char* GetStateName(CompareICState::State state);
196 196
197 static State TargetState(State old_state, State old_left, State old_right, 197 static State TargetState(State old_state, State old_left, State old_right,
198 Token::Value op, bool has_inlined_smi_code, 198 Token::Value op, bool has_inlined_smi_code,
199 Handle<Object> x, Handle<Object> y); 199 Handle<Object> x, Handle<Object> y);
200 }; 200 };
201 201
202 202
203 class LoadICState final BASE_EMBEDDED { 203 class LoadICState final BASE_EMBEDDED {
204 private:
205 class ContextualModeBits : public BitField<ContextualMode, 0, 1> {};
206 class LanguageModeBits : public BitField<LanguageMode, 1, 2> {};
207 STATIC_ASSERT(static_cast<int>(NOT_CONTEXTUAL) == 0);
208 const ExtraICState state_;
209
210 public: 204 public:
211 static const ExtraICState kStrongModeState = STRONG
212 << LanguageModeBits::kShift;
213
214 explicit LoadICState(ExtraICState extra_ic_state) : state_(extra_ic_state) {} 205 explicit LoadICState(ExtraICState extra_ic_state) : state_(extra_ic_state) {}
215 206
216 explicit LoadICState(ContextualMode mode, LanguageMode language_mode) 207 explicit LoadICState(ContextualMode mode)
217 : state_(ContextualModeBits::encode(mode) | 208 : state_(ContextualModeBits::encode(mode)) {}
218 LanguageModeBits::encode(language_mode)) {}
219 209
220 ExtraICState GetExtraICState() const { return state_; } 210 ExtraICState GetExtraICState() const { return state_; }
221 211
222 ContextualMode contextual_mode() const { 212 ContextualMode contextual_mode() const {
223 return ContextualModeBits::decode(state_); 213 return ContextualModeBits::decode(state_);
224 } 214 }
225 215
226 LanguageMode language_mode() const {
227 return LanguageModeBits::decode(state_);
228 }
229
230 static ContextualMode GetContextualMode(ExtraICState state) { 216 static ContextualMode GetContextualMode(ExtraICState state) {
231 return LoadICState(state).contextual_mode(); 217 return LoadICState(state).contextual_mode();
232 } 218 }
233 219
234 static LanguageMode GetLanguageMode(ExtraICState state) { 220 private:
235 return LoadICState(state).language_mode(); 221 class ContextualModeBits : public BitField<ContextualMode, 0, 1> {};
236 } 222 STATIC_ASSERT(static_cast<int>(NOT_CONTEXTUAL) == 0);
223
224 const ExtraICState state_;
237 }; 225 };
238 226
239 227
240 class StoreICState final BASE_EMBEDDED { 228 class StoreICState final BASE_EMBEDDED {
241 public: 229 public:
242 explicit StoreICState(ExtraICState extra_ic_state) : state_(extra_ic_state) {} 230 explicit StoreICState(ExtraICState extra_ic_state) : state_(extra_ic_state) {}
243 231
244 explicit StoreICState(LanguageMode mode) 232 explicit StoreICState(LanguageMode mode)
245 : state_(LanguageModeState::encode(mode)) {} 233 : state_(LanguageModeState::encode(mode)) {}
246 234
(...skipping 15 matching lines...) Expand all
262 static const ExtraICState kStrictModeState = STRICT 250 static const ExtraICState kStrictModeState = STRICT
263 << LanguageModeState::kShift; 251 << LanguageModeState::kShift;
264 252
265 private: 253 private:
266 const ExtraICState state_; 254 const ExtraICState state_;
267 }; 255 };
268 } 256 }
269 } 257 }
270 258
271 #endif // V8_IC_STATE_H_ 259 #endif // V8_IC_STATE_H_
OLDNEW
« no previous file with comments | « src/ic/ic-inl.h ('k') | src/ic/mips/handler-compiler-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698