Vendor import of llvm-project main llvmorg-15-init-16436-g18a6ab5b8d1f. - src

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2022-07-14 18:50:02 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2022-07-14 18:50:02 +0000
commit	1f917f69ff07f09b6dbb670971f57f8efe718b84 (patch)
tree	99293cbc1411737cd995dac10a99b2c40ef0944c /clang/lib/Basic
parent	145449b1e420787bb99721a429341fa6be3adfb6 (diff)

Vendor import of llvm-project main llvmorg-15-init-16436-g18a6ab5b8d1f.vendor/llvm-project/llvmorg-15-init-16436-g18a6ab5b8d1f

Diffstat (limited to 'clang/lib/Basic')

-rw-r--r--

clang/lib/Basic/LangStandards.cpp

-rw-r--r--

clang/lib/Basic/MakeSupport.cpp

-rw-r--r--

clang/lib/Basic/TargetInfo.cpp

-rw-r--r--

clang/lib/Basic/Targets/RISCV.cpp

-rw-r--r--

clang/lib/Basic/Targets/SystemZ.h

-rw-r--r--

clang/lib/Basic/Targets/X86.cpp

-rw-r--r--

clang/lib/Basic/Targets/X86.h

7 files changed, 57 insertions, 7 deletions

diff --git a/clang/lib/Basic/LangStandards.cpp b/clang/lib/Basic/LangStandards.cpp
index 5bacc3b16496..a21898dd3c62 100644
--- a/clang/lib/Basic/LangStandards.cpp
+++ b/clang/lib/Basic/LangStandards.cpp

@@ -61,8 +61,8 @@ LangStandard::Kind clang::getDefaultLanguageStandard(clang::Language Lang,

if (CLANG_DEFAULT_STD_C != LangStandard::lang_unspecified)

return CLANG_DEFAULT_STD_C;

- // The PS4 and PS5 use C99 as the default C standard.

- if (T.isPS())

+ // The PS4 uses C99 as the default C standard.

+ if (T.isPS4())

return LangStandard::lang_gnu99;

return LangStandard::lang_gnu17;

case Language::ObjC:

diff --git a/clang/lib/Basic/MakeSupport.cpp b/clang/lib/Basic/MakeSupport.cpp
new file mode 100644
index 000000000000..37838f7bbc7b
--- /dev/null
+++ b/clang/lib/Basic/MakeSupport.cpp

@@ -0,0 +1,35 @@

+//===-- MakeSuport.cpp --------------------------------------------------*-===//

+//

+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

+// See https://llvm.org/LICENSE.txt for license information.

+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

+//

+//===----------------------------------------------------------------------===//

+#include "clang/Basic/MakeSupport.h"

+void clang::quoteMakeTarget(StringRef Target, SmallVectorImpl<char> &Res) {

+ for (unsigned i = 0, e = Target.size(); i != e; ++i) {

+ switch (Target[i]) {

+ case ' ':

+ case '\t':

+ // Escape the preceding backslashes

+ for (int j = i - 1; j >= 0 && Target[j] == '\\'; --j)

+ Res.push_back('\\');

+ // Escape the space/tab

+ Res.push_back('\\');

+ break;

+ case '$':

+ Res.push_back('$');

+ break;

+ case '#':

+ Res.push_back('\\');

+ break;

+ default:

+ break;

+ }

+ Res.push_back(Target[i]);

+ }

+} \ No newline at end of file

diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp
index e22ed34e7da4..6685145ea6d2 100644
--- a/clang/lib/Basic/TargetInfo.cpp
+++ b/clang/lib/Basic/TargetInfo.cpp

@@ -503,7 +503,7 @@ bool TargetInfo::initFeatureMap(

TargetInfo::CallingConvKind

TargetInfo::getCallingConvKind(bool ClangABICompat4) const {

if (getCXXABI() != TargetCXXABI::Microsoft &&

- (ClangABICompat4 || getTriple().getOS() == llvm::Triple::PS4))

+ (ClangABICompat4 || getTriple().isPS4()))

return CCK_ClangABI4OrPS4;

return CCK_Default;

}

diff --git a/clang/lib/Basic/Targets/RISCV.cpp b/clang/lib/Basic/Targets/RISCV.cpp
index 32dd2bad2c5c..cb2cdb50e18e 100644
--- a/clang/lib/Basic/Targets/RISCV.cpp
+++ b/clang/lib/Basic/Targets/RISCV.cpp

@@ -252,7 +252,7 @@ bool RISCVTargetInfo::hasFeature(StringRef Feature) const {

.Case("64bit", Is64Bit)

.Default(None);

if (Result)

- return Result.getValue();

+ return Result.value();

if (ISAInfo->isSupportedExtensionFeature(Feature))

return ISAInfo->hasExtension(Feature);

diff --git a/clang/lib/Basic/Targets/SystemZ.h b/clang/lib/Basic/Targets/SystemZ.h
index d12045c756c1..e4f242e624cb 100644
--- a/clang/lib/Basic/Targets/SystemZ.h
+++ b/clang/lib/Basic/Targets/SystemZ.h

@@ -123,6 +123,14 @@ public:

void fillValidCPUList(SmallVectorImpl<StringRef> &Values) const override;

+ bool isValidTuneCPUName(StringRef Name) const override {

+ return isValidCPUName(Name);

+ }

+ void fillValidTuneCPUList(SmallVectorImpl<StringRef> &Values) const override {

+ fillValidCPUList(Values);

+ }

bool setCPU(const std::string &Name) override {

CPU = Name;

ISARevision = getISARevision(CPU);

diff --git a/clang/lib/Basic/Targets/X86.cpp b/clang/lib/Basic/Targets/X86.cpp
index 06988830eaed..69afdf8a3584 100644
--- a/clang/lib/Basic/Targets/X86.cpp
+++ b/clang/lib/Basic/Targets/X86.cpp

@@ -297,6 +297,8 @@ bool X86TargetInfo::handleTargetFeatures(std::vector<std::string> &Features,

HasCLDEMOTE = true;

} else if (Feature == "+rdpid") {

HasRDPID = true;

+ } else if (Feature == "+rdpru") {

+ HasRDPRU = true;

} else if (Feature == "+kl") {

HasKL = true;

} else if (Feature == "+widekl") {

@@ -743,6 +745,8 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts,

Builder.defineMacro("__WIDEKL__");

if (HasRDPID)

Builder.defineMacro("__RDPID__");

+ if (HasRDPRU)

+ Builder.defineMacro("__RDPRU__");

if (HasCLDEMOTE)

Builder.defineMacro("__CLDEMOTE__");

if (HasWAITPKG)

@@ -926,6 +930,7 @@ bool X86TargetInfo::isValidFeatureName(StringRef Name) const {

.Case("prfchw", true)

.Case("ptwrite", true)

.Case("rdpid", true)

+ .Case("rdpru", true)

.Case("rdrnd", true)

.Case("rdseed", true)

.Case("rtm", true)

@@ -1021,6 +1026,7 @@ bool X86TargetInfo::hasFeature(StringRef Feature) const {

.Case("prfchw", HasPRFCHW)

.Case("ptwrite", HasPTWRITE)

.Case("rdpid", HasRDPID)

+ .Case("rdpru", HasRDPRU)

.Case("rdrnd", HasRDRND)

.Case("rdseed", HasRDSEED)

.Case("retpoline-external-thunk", HasRetpolineExternalThunk)

diff --git a/clang/lib/Basic/Targets/X86.h b/clang/lib/Basic/Targets/X86.h
index 78e444f4e4eb..ea98dcf42de6 100644
--- a/clang/lib/Basic/Targets/X86.h
+++ b/clang/lib/Basic/Targets/X86.h

@@ -125,6 +125,7 @@ class LLVM_LIBRARY_VISIBILITY X86TargetInfo : public TargetInfo {

bool HasMOVBE = false;

bool HasPREFETCHWT1 = false;

bool HasRDPID = false;

+ bool HasRDPRU = false;

bool HasRetpolineExternalThunk = false;

bool HasLAHFSAHF = false;

bool HasWBNOINVD = false;

@@ -420,8 +421,8 @@ public:

// Use fpret for all types.

RealTypeUsesObjCFPRetMask =

- (int)(FloatModeKind::Float | FloatModeKind::Double |

- FloatModeKind::LongDouble);

+ (unsigned)(FloatModeKind::Float | FloatModeKind::Double |

+ FloatModeKind::LongDouble);

// x86-32 has atomics up to 8 bytes

MaxAtomicPromoteWidth = 64;

@@ -700,7 +701,7 @@ public:

"64-i64:64-f80:128-n8:16:32:64-S128");

// Use fpret only for long double.

- RealTypeUsesObjCFPRetMask = (int)FloatModeKind::LongDouble;

+ RealTypeUsesObjCFPRetMask = (unsigned)FloatModeKind::LongDouble;

// Use fp2ret for _Complex long double.

ComplexLongDoubleUsesFP2Ret = true;