Subzero. Fixes valgrind errors.

Valgrind used to report errors about uninitialized variable access in Subzero, when it was built with -O2. The problem was traced to size_t Alignment = Var->getAlignment; Alignment = std::max(MinAlignment, Var->getAlignment()) Apparently, the compiler will not correctly zero-extend Var->getAlignment(), and thus Alignment's upper 32-bits would be garbage. BUG= R=kschimpf@google.com, stichnot@chromium.org Review URL: https://codereview.chromium.org/1825363003 .

Subzero. Fixes valgrind errors.
267f2bf9 · John Porto · abe7dd5f · 267f2bf9
Commit 267f2bf9 authored Mar 24, 2016 by John Porto
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

IceELFObjectWriter.cpp src/IceELFObjectWriter.cpp +1 -2

No files found.
--- a/src/IceELFObjectWriter.cpp
+++ b/src/IceELFObjectWriter.cpp
@@ -388,9 +388,8 @@ void ELFObjectWriter::writeDataOfType(SectionType ST,
    // entry will be created separately.
    if (!Var->hasInitializer())
      continue;
-    Elf64_Xword Align = Var->getAlignment();
    constexpr Elf64_Xword MinAlign = 1;
-    Align = std::max(Align, MinAlign);
+    const auto Align = std::max<Elf64_Xword>(MinAlign, Var->getAlignment());
    Section->padToAlignment(Str, Align);
    SizeT SymbolSize = Var->getNumBytes();
    bool IsExternal = Var->isExternal() || Ctx.getFlags().getDisableInternal();