From ace7a000a433ce4ecf94f30adea39c01a76fa936 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 5 Apr 2016 11:18:49 +0100 Subject: Optimizing: LoadString may not have any side effects. LoadString does not have any side effects if the string is known to be in the dex cache or it's a boot image string referenced directly, as specified by the string load kind. We need to clear the side effects for these cases to avoid a DCHECK() failure when such LoadString instruction ends up between a ClinitCheck and an instruction to which we want to merge that ClinitCheck. This may happen as a consequence of inlining, LICM and DCE as shown by a regression test. Bug: 27929914 Change-Id: I7b3bddf7d8c79ce1828a4a751f1270cf2e3d61f0 --- compiler/optimizing/nodes.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'compiler/optimizing/nodes.cc') diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 9f448af73a..6aa8cef430 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -2346,6 +2346,7 @@ void HLoadString::SetLoadKindInternal(LoadKind load_kind) { } if (!NeedsEnvironment()) { RemoveEnvironment(); + SetSideEffects(SideEffects::None()); } } -- cgit v1.2.3-59-g8ed1b