Implemented global redzones.

src/IceASanInstrumentation.cpp

+//===- subzero/src/IceASanInstrumentation.cpp - ASan ------------*- C++ -*-===//
+//
+//                        The Subzero Code Generator
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+///
+/// \file
+/// \brief Implements the AddressSanitizer instrumentation class.
+///
+//===----------------------------------------------------------------------===//
+
+#include "IceASanInstrumentation.h"
+
+#include "IceBuildDefs.h"
+#include "IceGlobalInits.h"
+
+#include <sstream>
+
+namespace Ice {
+
+namespace {
+const SizeT RzSize = 32;

[Jim Stichnoth, 2016/06/10 22:38:33]

constexpr

[tlively, 2016/06/10 23:43:32]

Done.

+const std::string RzPrefix = "__$rz";
+const llvm::NaClBitcodeRecord::RecordVector RzContents =
+    llvm::NaClBitcodeRecord::RecordVector(RzSize, 'R');
+} // end of anonymous namespace
+
+// Create redzones between all global variables, ensuring that the initializer
+// types of the redzones and their associated globals match so that they are
+// laid out together in memory.
+void ASanInstrumentation::instrumentGlobals(VariableDeclarationList &Globals) {
+  if (BuildDefs::minimal() || DidInsertRedZones)
+    return;
+
+  VariableDeclarationList NewGlobals;
+  // Global holding pointers to all redzones
+  VariableDeclaration *RzArray = VariableDeclaration::create(&NewGlobals);

[Jim Stichnoth, 2016/06/10 22:38:33]

I would use "auto" here, and other places with the pattern
  Foo *Ptr = Foo::create();

[tlively, 2016/06/10 23:43:32]

Done.

+  // Global holding the size of RzArray
+  VariableDeclaration *RzArraySizeVar =
+      VariableDeclaration::create(&NewGlobals);
+  static SizeT RzArraySize = 0;

[Jim Stichnoth, 2016/06/10 22:38:33]

I don't think this should be static?

[tlively, 2016/06/10 23:43:32]

Done.

+
+  RzArray->setName(Ctx, nextRzName());
+  RzArraySizeVar->setName(Ctx, nextRzName());
+  NewGlobals.push_back(RzArray);
+  NewGlobals.push_back(RzArraySizeVar);
+
+  for (VariableDeclaration *Global : Globals) {
+    VariableDeclaration *RzLeft =
+        createRz(&NewGlobals, RzArray, RzArraySize, Global);
+    VariableDeclaration *RzRight =
+        createRz(&NewGlobals, RzArray, RzArraySize, Global);
+    NewGlobals.push_back(RzLeft);
+    NewGlobals.push_back(Global);
+    NewGlobals.push_back(RzRight);
+  }
+
+  // update the contents of the RzArraySize global
+  llvm::NaClBitcodeRecord::RecordVector SizeContents;
+  for (unsigned i = 0; i < sizeof(RzArraySize); i++) {
+    SizeContents.emplace_back(RzArraySize % (1 << CHAR_BIT));
+    RzArraySize >>= CHAR_BIT;
+  }
+  RzArraySizeVar->addInitializer(
+      VariableDeclaration::DataInitializer::create(&NewGlobals, SizeContents));
+
+  // Replace old list of globals, without messing up arena allocators
+  Globals.clear();
+  Globals.merge(&NewGlobals);
+  DidInsertRedZones = true;
+
+  // Log the new set of globals
+  if (BuildDefs::dump()) {
+    OstreamLocker _(Ctx);
+    Ctx->getStrDump() << "========= Instrumented Globals =========\n";
+    for (VariableDeclaration *Global : Globals) {
+      Global->dump(Ctx->getStrDump());
+    }
+  }
+}
+
+std::string ASanInstrumentation::nextRzName() {
+  std::stringstream Name;

[Jim Stichnoth, 2016/06/10 22:38:33]

if (BuildDefs::minimal())
  return "";

[tlively, 2016/06/10 23:43:32]

Done.

+  Name << RzPrefix << RzNum++;
+  return Name.str();
+}
+
+VariableDeclaration *
+ASanInstrumentation::createRz(VariableDeclarationList *List,
+                              VariableDeclaration *RzArray, SizeT &RzArraySize,
+                              VariableDeclaration *Global) {
+  VariableDeclaration *Rz = VariableDeclaration::create(List);

[Jim Stichnoth, 2016/06/10 22:38:33]

if (BuildDefs::minimal())
  return nullptr;

[tlively, 2016/06/10 23:43:32]

Done.

+  Rz->setName(Ctx, nextRzName());
+  if (Global->hasNonzeroInitializer()) {
+    Rz->addInitializer(
+        VariableDeclaration::DataInitializer::create(List, RzContents));
+  } else {
+    Rz->addInitializer(
+        VariableDeclaration::ZeroInitializer::create(List, RzSize));
+  }
+  Rz->setIsConstant(Global->getIsConstant());
+  RzArray->addInitializer(VariableDeclaration::RelocInitializer::create(
+      List, Rz, RelocOffsetArray(0)));
+  ++RzArraySize;
+  return Rz;
+}
+
+} // end of namespace Ice