[LLDB] Address post-commit code review feedback.

This patch addresses Adrian McCarthy's code review feedback in
https://reviews.llvm.org/D66447

llvm-svn: 369731

2 files changed, 2 insertions, 4 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/main.cpp
index b257ae2d794..b73ba0c4e61 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char8_t/main.cpp
@@ -1,5 +1,3 @@
-#include <cstring>
-
 char8_t a  = u8'a';
 const char8_t* ab = u8"你好";
 char8_t abc[9] = u8"你好";
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index d1d9a7399f3..faeaf78339b 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -1390,9 +1390,9 @@ CompilerType ClangASTContext::GetBuiltinTypeForDWARFEncodingAndBitSize(
       if (type_name) {
         if (streq(type_name, "char16_t"))
           return CompilerType(this, ast->Char16Ty.getAsOpaquePtr());
-        else if (streq(type_name, "char32_t"))
+        if (streq(type_name, "char32_t"))
           return CompilerType(this, ast->Char32Ty.getAsOpaquePtr());
-        else if (streq(type_name, "char8_t"))
+        if (streq(type_name, "char8_t"))
           return CompilerType(this, ast->Char8Ty.getAsOpaquePtr());
       }
       break;