From 328066513d18acd4e44ad57172c73f1a2a026022 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 12 Nov 2013 23:27:08 +0000 Subject: Remove always true flag. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194530 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCAsmInfo.h | 7 ------- lib/MC/MCAsmInfo.cpp | 1 - lib/Target/Mangler.cpp | 10 ++++------ 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/include/llvm/MC/MCAsmInfo.h b/include/llvm/MC/MCAsmInfo.h index 0c2bc4ca81..3da3a31b5f 100644 --- a/include/llvm/MC/MCAsmInfo.h +++ b/include/llvm/MC/MCAsmInfo.h @@ -160,10 +160,6 @@ namespace llvm { /// names. Defaults to false. bool AllowAtInName; - /// AllowUTF8 - This is true if the assembler accepts UTF-8 input. - // FIXME: Make this a more general encoding setting? - bool AllowUTF8; - /// UseDataRegionDirectives - This is true if data region markers should /// be printed as ".data_region/.end_data_region" directives. If false, /// use "$d/$a" labels instead. @@ -483,9 +479,6 @@ namespace llvm { bool doesAllowAtInName() const { return AllowAtInName; } - bool doesAllowUTF8() const { - return AllowUTF8; - } bool doesSupportDataRegionDirectives() const { return UseDataRegionDirectives; } diff --git a/lib/MC/MCAsmInfo.cpp b/lib/MC/MCAsmInfo.cpp index 73724dbc78..fd822b589a 100644 --- a/lib/MC/MCAsmInfo.cpp +++ b/lib/MC/MCAsmInfo.cpp @@ -54,7 +54,6 @@ MCAsmInfo::MCAsmInfo() { AllowNameToStartWithDigit = false; AllowPeriodsInName = true; AllowAtInName = false; - AllowUTF8 = true; UseDataRegionDirectives = false; ZeroDirective = "\t.zero\t"; AsciiDirective = "\t.ascii\t"; diff --git a/lib/Target/Mangler.cpp b/lib/Target/Mangler.cpp index 1deaf2b115..20f70a375e 100644 --- a/lib/Target/Mangler.cpp +++ b/lib/Target/Mangler.cpp @@ -23,13 +23,13 @@ #include "llvm/Support/raw_ostream.h" using namespace llvm; -static bool isAcceptableChar(char C, bool AllowPeriod, bool AllowUTF8) { +static bool isAcceptableChar(char C, bool AllowPeriod) { if ((C < 'a' || C > 'z') && (C < 'A' || C > 'Z') && (C < '0' || C > '9') && C != '_' && C != '$' && C != '@' && !(AllowPeriod && C == '.') && - !(AllowUTF8 && (C & 0x80))) + !(C & 0x80)) return false; return true; } @@ -58,9 +58,8 @@ static bool NameNeedsEscaping(StringRef Str, const MCAsmInfo *MAI) { // If any of the characters in the string is an unacceptable character, force // quotes. bool AllowPeriod = MAI->doesAllowPeriodsInName(); - bool AllowUTF8 = MAI->doesAllowUTF8(); for (unsigned i = 0, e = Str.size(); i != e; ++i) - if (!isAcceptableChar(Str[i], AllowPeriod, AllowUTF8)) + if (!isAcceptableChar(Str[i], AllowPeriod)) return true; return false; } @@ -77,9 +76,8 @@ static void appendMangledName(SmallVectorImpl &OutName, StringRef Str, } bool AllowPeriod = MAI->doesAllowPeriodsInName(); - bool AllowUTF8 = MAI->doesAllowUTF8(); for (unsigned i = 0, e = Str.size(); i != e; ++i) { - if (!isAcceptableChar(Str[i], AllowPeriod, AllowUTF8)) + if (!isAcceptableChar(Str[i], AllowPeriod)) MangleLetter(OutName, Str[i]); else OutName.push_back(Str[i]); -- cgit v1.2.3