From 828c21c8d7931441c3e83462e9c965bab006482a Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Sun, 23 Dec 2018 11:30:31 -0800
Subject: [PATCH] Make cacheDirectory related to project root; delete Timer

---
 src/messages/initialize.cc | 5 +++--
 src/pipeline.cc            | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/messages/initialize.cc b/src/messages/initialize.cc
index 0aa0488c..10db5208 100644
--- a/src/messages/initialize.cc
+++ b/src/messages/initialize.cc
@@ -282,8 +282,9 @@ void Initialize(MessageHandler *m, InitializeParam &param, ReplyOnce &reply) {
 
     if (g_config->cacheDirectory.size()) {
       SmallString<256> Path(g_config->cacheDirectory);
-      sys::fs::make_absolute(Path);
-      g_config->cacheDirectory = Path.str();
+      sys::fs::make_absolute(project_path, Path);
+      // Use upper case for the Driver letter on Windows.
+      g_config->cacheDirectory = NormalizePath(Path.str());
       EnsureEndsInSlash(g_config->cacheDirectory);
     }
   }
diff --git a/src/pipeline.cc b/src/pipeline.cc
index 829fe796..f298595a 100644
--- a/src/pipeline.cc
+++ b/src/pipeline.cc
@@ -31,7 +31,6 @@ limitations under the License.
 
 #include <llvm/Support/Process.h>
 #include <llvm/Support/Threading.h>
-#include <llvm/Support/Timer.h>
 using namespace llvm;
 
 #include <chrono>
@@ -435,10 +434,7 @@ void Main_OnIndexed(DB *db, WorkingFiles *wfiles, IndexUpdate *update) {
     return;
   }
 
-  static Timer timer("apply", "apply index");
-  timer.startTimer();
   db->ApplyIndexUpdate(update);
-  timer.stopTimer();
 
   // Update indexed content, skipped ranges, and semantic highlighting.
   if (update->files_def_update) {