From 3231dd3c1c65ef67a61deebc4ee34c746ad40945 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Mon, 19 Jan 2015 10:54:36 +0000
Subject: [PATCH] [sanitizer] Simplify code in flag parser.

llvm-svn: 226452
---
 compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.cc b/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.cc
index b32deca..fb6ac10 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_flag_parser.cc
@@ -63,10 +63,7 @@ void FlagParser::parse_flag() {
   }
 
   bool res = run_handler(name, value);
-  if (!res) {
-    Printf("Flag parsing failed.");
-    Die();
-  }
+  if (!res) fatal_error("Flag parsing failed.");
   InternalFree(name);
   InternalFree(value);
 }
@@ -108,7 +105,7 @@ bool FlagParser::run_handler(const char *name, const char *value) {
 
 void FlagParser::RegisterHandler(const char *name, FlagHandlerBase *handler,
                                  const char *desc) {
-  CHECK(n_flags_ < kMaxFlags);
+  CHECK_LT(n_flags_, kMaxFlags);
   flags_[n_flags_].name = name;
   flags_[n_flags_].desc = desc;
   flags_[n_flags_].handler = handler;
-- 
2.7.4