summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-10-14 13:26:49 -0700
committer Andreas Gampe <agampe@google.com> 2015-10-14 13:26:49 -0700
commit0a67a9cf6fffd8d43f0d089c88b7f4d8b543a41a (patch)
treef898ca8079eeeb2c9673038da5b1f745ef65e7fe
parent51398646cfd6f8747c73c6c1cc65a0688613b19c (diff)
ART: Fix build
We warn on multiline comments. Bug: 23502994 Change-Id: I1ab89585c0350922675c242d107682ca27489cc1
-rw-r--r--runtime/verifier/register_line.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/verifier/register_line.cc b/runtime/verifier/register_line.cc
index eade78785b..02c93cf864 100644
--- a/runtime/verifier/register_line.cc
+++ b/runtime/verifier/register_line.cc
@@ -455,9 +455,9 @@ bool RegisterLine::MergeRegisters(MethodVerifier* verifier, const RegisterLine*
// Example (lock status in curly braces as pair of register and lock leels):
//
// lock v1 {v1=1}
- // / \
+ // | |
// v0 = v1 {v0=1, v1=1} v0 = v2 {v1=1}
- // \ /
+ // | |
// {v1=1}
// // Dropping v0, as the status can't be merged
// // but the lock info ("locked at depth 1" and)
@@ -495,9 +495,9 @@ bool RegisterLine::MergeRegisters(MethodVerifier* verifier, const RegisterLine*
//
// lock v1 {v1=1}
// lock v2 {v1=1, v2=2}
- // / \
+ // | |
// v0 = v1 {v0=1, v1=1, v2=2} v0 = v2 {v0=2, v1=1, v2=2}
- // \ /
+ // | |
// {v1=1, v2=2}
// // Dropping v0, as the status can't be
// // merged but the lock info ("locked at