[SystemZ][z/OS] Improve use of formatv #174503
Merged
+9
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Using a `raw_svector_ostream` object is not necessary, because this is hidden in the conversion function. In addition, there is no need to reason about a zero termination of the string. Declaring the ascii and ebcdic version of the string variables at the same time makes sure that both strings are allocated with the same size.
Member
|
@llvm/pr-subscribers-backend-systemz Author: Kai Nacke (redstar) ChangesUsing a Full diff: https://github.com/llvm/llvm-project/pull/174503.diff 1 Files Affected:
diff --git a/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp b/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
index 444bc578a3fab..332a38281eab0 100644
--- a/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
+++ b/llvm/lib/Target/SystemZ/SystemZAsmPrinter.cpp
@@ -1602,25 +1602,19 @@ void SystemZAsmPrinter::emitPPA2(Module &M) {
MCSymbol *DateVersionSym = OutContext.createTempSymbol("DVS", false);
std::time_t Time = getTranslationTime(M);
- SmallString<15> CompilationTime; // 14 + null
- raw_svector_ostream O(CompilationTime);
- O << formatv("{0:%Y%m%d%H%M%S}", llvm::sys::toUtcTime(Time));
+ SmallString<14> CompilationTimeEBCDIC, CompilationTime;
+ CompilationTime = formatv("{0:%Y%m%d%H%M%S}", llvm::sys::toUtcTime(Time));
uint32_t ProductVersion = getProductVersion(M),
ProductRelease = getProductRelease(M),
ProductPatch = getProductPatch(M);
- SmallString<7> Version; // 6 + null
- raw_svector_ostream ostr(Version);
- ostr << formatv("{0,0-2:d}{1,0-2:d}{2,0-2:d}", ProductVersion, ProductRelease,
- ProductPatch);
+ SmallString<6> VersionEBCDIC, Version;
+ Version = formatv("{0,0-2:d}{1,0-2:d}{2,0-2:d}", ProductVersion,
+ ProductRelease, ProductPatch);
- // Drop 0 during conversion.
- SmallString<sizeof(CompilationTime) - 1> CompilationTimeStr;
- SmallString<sizeof(Version) - 1> VersionStr;
-
- ConverterEBCDIC::convertToEBCDIC(CompilationTime, CompilationTimeStr);
- ConverterEBCDIC::convertToEBCDIC(Version, VersionStr);
+ ConverterEBCDIC::convertToEBCDIC(CompilationTime, CompilationTimeEBCDIC);
+ ConverterEBCDIC::convertToEBCDIC(Version, VersionEBCDIC);
enum class PPA2MemberId : uint8_t {
// See z/OS Language Environment Vendor Interfaces v2r5, p.23, for
@@ -1689,8 +1683,8 @@ void SystemZAsmPrinter::emitPPA2(Module &M) {
// Emit date and version section.
OutStreamer->emitLabel(DateVersionSym);
- OutStreamer->emitBytes(CompilationTimeStr.str());
- OutStreamer->emitBytes(VersionStr.str());
+ OutStreamer->emitBytes(CompilationTimeEBCDIC.str());
+ OutStreamer->emitBytes(VersionEBCDIC.str());
OutStreamer->emitInt16(0x0000); // Service level string length.
|
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/129/builds/36089 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using a
raw_svector_ostreamobject is not necessary, because this is hidden in the conversion function. In addition, there is no need to reason about a zero termination of the string. Declaring the ascii and ebcdic version of the string variables at the same time makes sure that both strings are allocated with the same size.