commit 2ad6cceed5fd531c86e9da4ebdf2cb6c012382a0
author Andreas Gampe <agampe@google.com> Thu Apr 11 16:17:39 2019 -0700
committer Andreas Gampe <agampe@google.com> Mon Apr 15 17:38:27 2019 +0000
tree 804103d4e5b34770168d4175cba9942efe6f2074
parent b29ecc1a44f2741bd8287c659be1c0854d4f6365

ART: Make LogVerifyInfo newlines consistent

Use an RAII helper to make logging to the verifier's info_messages_
consistent - no caller needs to add a final newline.

Test: m
Test: manual
Change-Id: Ic830b816293078873160808fe275b862a672ff47

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index b6497b4..fae3af3 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -57,6 +57,7 @@
 #include "reg_type-inl.h"
 #include "register_line-inl.h"
 #include "runtime.h"
+#include "scoped_newline.h"
 #include "scoped_thread_state_change-inl.h"
 #include "stack.h"
 #include "vdex_file.h"
@@ -690,9 +691,11 @@
   return *failure_message;
 }
 
-std::ostream& MethodVerifier::LogVerifyInfo() {
-  return info_messages_ << "VFY: " << dex_file_->PrettyMethod(dex_method_idx_)
-                        << '[' << reinterpret_cast<void*>(work_insn_idx_) << "] : ";
+ScopedNewLine MethodVerifier::LogVerifyInfo() {
+  ScopedNewLine ret{info_messages_};
+  ret << "VFY: " << dex_file_->PrettyMethod(dex_method_idx_)
+      << '[' << reinterpret_cast<void*>(work_insn_idx_) << "] : ";
+  return ret;
 }
 
 void MethodVerifier::PrependToLastFailMessage(std::string prepend) {
@@ -1814,8 +1817,8 @@
   bool just_set_result = false;
   if (UNLIKELY(VLOG_IS_ON(verifier_debug))) {
     // Generate processing back trace to debug verifier
-    LogVerifyInfo() << "Processing " << inst->DumpString(dex_file_) << "\n"
-                    << work_line_->Dump(this) << "\n";
+    LogVerifyInfo() << "Processing " << inst->DumpString(dex_file_) << std::endl
+                    << work_line_->Dump(this);
   }
 
   /*
@@ -4751,7 +4754,7 @@
                       << " to [" << reinterpret_cast<void*>(next_insn) << "]: " << "\n"
                       << copy->Dump(this) << "  MERGE\n"
                       << merge_line->Dump(this) << "  ==\n"
-                      << target_line->Dump(this) << "\n";
+                      << target_line->Dump(this);
     }
     if (update_merge_line && changed) {
       merge_line->CopyFromLine(target_line);