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

Side by Side Diff: runtime/vm/intermediate_language.cc

Issue 2637173003: VM: Fix [StringInterpolateInstr]s canonicalization: null.ToString() should return "null" (not "Null… (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | runtime/vm/symbols.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 (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/intermediate_language.h" 5 #include "vm/intermediate_language.h"
6 6
7 #include "vm/bit_vector.h" 7 #include "vm/bit_vector.h"
8 #include "vm/bootstrap.h" 8 #include "vm/bootstrap.h"
9 #include "vm/compiler.h" 9 #include "vm/compiler.h"
10 #include "vm/constant_propagator.h" 10 #include "vm/constant_propagator.h"
(...skipping 3593 matching lines...) Expand 10 before | Expand all | Expand 10 after
3604 if (obj.IsString()) { 3604 if (obj.IsString()) {
3605 pieces.SetAt(store_index, String::Cast(obj)); 3605 pieces.SetAt(store_index, String::Cast(obj));
3606 } else if (obj.IsSmi()) { 3606 } else if (obj.IsSmi()) {
3607 const char* cstr = obj.ToCString(); 3607 const char* cstr = obj.ToCString();
3608 pieces.SetAt(store_index, 3608 pieces.SetAt(store_index,
3609 String::Handle(zone, String::New(cstr, Heap::kOld))); 3609 String::Handle(zone, String::New(cstr, Heap::kOld)));
3610 } else if (obj.IsBool()) { 3610 } else if (obj.IsBool()) {
3611 pieces.SetAt(store_index, Bool::Cast(obj).value() ? Symbols::True() 3611 pieces.SetAt(store_index, Bool::Cast(obj).value() ? Symbols::True()
3612 : Symbols::False()); 3612 : Symbols::False());
3613 } else if (obj.IsNull()) { 3613 } else if (obj.IsNull()) {
3614 pieces.SetAt(store_index, Symbols::Null()); 3614 pieces.SetAt(store_index, Symbols::null());
3615 } else { 3615 } else {
3616 return this; 3616 return this;
3617 } 3617 }
3618 } else { 3618 } else {
3619 return this; 3619 return this;
3620 } 3620 }
3621 } 3621 }
3622 3622
3623 const String& concatenated = 3623 const String& concatenated =
3624 String::ZoneHandle(zone, Symbols::FromConcatAll(thread, pieces)); 3624 String::ZoneHandle(zone, Symbols::FromConcatAll(thread, pieces));
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
3931 set_native_c_function(native_function); 3931 set_native_c_function(native_function);
3932 function().SetIsNativeAutoSetupScope(auto_setup_scope); 3932 function().SetIsNativeAutoSetupScope(auto_setup_scope);
3933 Dart_NativeEntryResolver resolver = library.native_entry_resolver(); 3933 Dart_NativeEntryResolver resolver = library.native_entry_resolver();
3934 bool is_bootstrap_native = Bootstrap::IsBootstapResolver(resolver); 3934 bool is_bootstrap_native = Bootstrap::IsBootstapResolver(resolver);
3935 set_is_bootstrap_native(is_bootstrap_native); 3935 set_is_bootstrap_native(is_bootstrap_native);
3936 } 3936 }
3937 3937
3938 #undef __ 3938 #undef __
3939 3939
3940 } // namespace dart 3940 } // namespace dart
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/symbols.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698