| Index: src/IceCompileServer.cpp
 | 
| diff --git a/src/IceCompileServer.cpp b/src/IceCompileServer.cpp
 | 
| index adb41025dfb1f3d646fae2b5b95f3a58f00d7826..19b19f8e19f690e6af9fd05be12637018fe9f10e 100644
 | 
| --- a/src/IceCompileServer.cpp
 | 
| +++ b/src/IceCompileServer.cpp
 | 
| @@ -241,6 +241,13 @@ void CLCompileServer::run() {
 | 
|    }
 | 
|  
 | 
|    Ctx.reset(new GlobalContext(Ls.get(), Os.get(), Ls.get(), ELFStr.get()));
 | 
| +
 | 
| +  // TODO(tlively): Make this instantiate an instrumentation subclass
 | 
| +  if (!BuildDefs::minimal() && getFlags().getSanitizeAddresses()) {
 | 
| +    std::unique_ptr<Instrumentation> Instr(new Instrumentation(Ctx.get()));
 | 
| +    Ctx->setInstrumentation(std::move(Instr));
 | 
| +  }
 | 
| +
 | 
|    if (getFlags().getNumTranslationThreads() != 0) {
 | 
|      std::thread CompileThread([this, &Flags, &InputStream]() {
 | 
|        Ctx->initParserThread();
 | 
| 
 |