merge main into amd-staging (llvm#2342)

Author: z1-cciauto

clang/lib/AST/ByteCode/Function.h

@@ -115,7 +115,7 @@ class Function final {
 
   /// Returns the name of the function decl this code
   /// was generated for.
-  const std::string getName() const {
+  std::string getName() const {
     if (!Source || !getDecl())
       return "<<expr>>";
 

clang/lib/Driver/ToolChains/ZOS.cpp

@@ -153,11 +153,10 @@ void zos::Linker::ConstructJob(Compilation &C, const JobAction &JA,
     StringRef OutputName = Output.getFilename();
     // Strip away the last file suffix in presence from output name and add
     // a new .x suffix.
-    size_t Suffix = OutputName.find_last_of('.');
-    const char *SideDeckName =
-        Args.MakeArgString(OutputName.substr(0, Suffix) + ".x");
+    SmallString<128> SideDeckName = OutputName;
+    llvm::sys::path::replace_extension(SideDeckName, "x");
     CmdArgs.push_back("-x");
-    CmdArgs.push_back(SideDeckName);
+    CmdArgs.push_back(Args.MakeArgString(SideDeckName));
   } else {
     // We need to direct side file to /dev/null to suppress linker warning when
     // the object file contains exported symbols, and -shared or

clang/test/Driver/zos-ld-sidedeck.c

@@ -0,0 +1,19 @@
+// Try using various forms of output file name to see what side deck file name looks like
+// RUN: %clang -### --shared --target=s390x-ibm-zos %s -o foo.out 2>&1 \
+// RUN:   | FileCheck --check-prefix=SD-BASE %s
+// RUN: %clang -### --shared --target=s390x-ibm-zos %s -o foo 2>&1 \
+// RUN:   | FileCheck --check-prefix=SD-BASE %s
+// SD-BASE: "-x" "foo.x"
+
+// RUN: %clang -### --shared --target=s390x-ibm-zos %s -o lib/foo.out 2>&1 \
+// RUN:   | FileCheck --check-prefix=SD-SUBDIR %s
+// RUN: %clang -### --shared --target=s390x-ibm-zos %s -o lib/foo 2>&1 \
+// RUN:   | FileCheck --check-prefix=SD-SUBDIR %s
+// SD-SUBDIR: "-x" "lib/foo.x"
+
+
+// RUN: %clang -### --shared --target=s390x-ibm-zos %s -o ../lib/foo.out 2>&1 \
+// RUN:   | FileCheck --check-prefix=SD-REL %s
+// RUN: %clang -### --shared --target=s390x-ibm-zos %s -o ../lib/foo 2>&1 \
+// RUN:   | FileCheck --check-prefix=SD-REL %s
+// SD-REL: "-x" "../lib/foo.x"

llvm/include/llvm/MC/MCLinkerOptimizationHint.h

@@ -108,7 +108,7 @@ class MCLOHDirective {
   /// Emit this directive in \p OutStream using the information available
   /// in the given \p ObjWriter and \p Layout to get the address of the
   /// arguments within the object file.
-  void emit_impl(const MCAssembler &Asm, raw_ostream &OutStream,
+  void emit_impl(raw_ostream &OutStream,
                  const MachObjectWriter &ObjWriter) const;
 
 public:

llvm/include/llvm/MC/MCMachObjectWriter.h

@@ -184,12 +184,8 @@ class MachObjectWriter final : public MCObjectWriter {
 
   const MCSymbol &findAliasedSymbol(const MCSymbol &Sym) const;
 
-  /// \name Lifetime management Methods
-  /// @{
-
   void reset() override;
-
-  /// @}
+  void setAssembler(MCAssembler *Asm) override;
 
   /// \name Utility Methods
   /// @{
@@ -208,7 +204,7 @@ class MachObjectWriter final : public MCObjectWriter {
   uint64_t getSectionAddress(const MCSection *Sec) const {
     return SectionAddress.lookup(Sec);
   }
-  uint64_t getSymbolAddress(const MCSymbol &S, const MCAssembler &Asm) const;
+  uint64_t getSymbolAddress(const MCSymbol &S) const;
 
   uint64_t getFragmentAddress(const MCAssembler &Asm,
                               const MCFragment *Fragment) const;

llvm/include/llvm/MC/MCObjectWriter.h

@@ -97,7 +97,7 @@ class MCObjectWriter {
   MutableArrayRef<std::pair<std::string, size_t>> getFileNames() {
     return FileNames;
   }
-  void addFileName(MCAssembler &Asm, StringRef FileName);
+  void addFileName(StringRef FileName);
   void setCompilerVersion(StringRef CompilerVers) {
     CompilerVersion = CompilerVers;
   }

llvm/include/llvm/MC/MCParser/AsmLexer.h

@@ -213,8 +213,6 @@ class AsmLexer {
   StringRef LexUntilEndOfLine();
 };
 
-using MCAsmLexer = AsmLexer;
-
 } // end namespace llvm
 
 #endif // LLVM_MC_MCPARSER_ASMLEXER_H

llvm/include/llvm/MC/MCParser/MCAsmLexer.h

@@ -163,8 +163,8 @@ class MCAsmParser {
   MCContext &getContext() { return Ctx; }
   MCStreamer &getStreamer() { return Out; }
   SourceMgr &getSourceManager() { return SrcMgr; }
-  MCAsmLexer &getLexer() { return Lexer; }
-  const MCAsmLexer &getLexer() const { return Lexer; }
+  AsmLexer &getLexer() { return Lexer; }
+  const AsmLexer &getLexer() const { return Lexer; }
 
   MCTargetAsmParser &getTargetParser() const { return *TargetParser; }
   void setTargetParser(MCTargetAsmParser &P);

llvm/include/llvm/MC/MCParser/MCAsmParser.h

@@ -53,8 +53,8 @@ class MCAsmParserExtension {
 
   MCContext &getContext() { return getParser().getContext(); }
 
-  MCAsmLexer &getLexer() { return getParser().getLexer(); }
-  const MCAsmLexer &getLexer() const {
+  AsmLexer &getLexer() { return getParser().getLexer(); }
+  const AsmLexer &getLexer() const {
     return const_cast<MCAsmParserExtension *>(this)->getLexer();
   }