From 6c9bc63a1cb9f17cb1e83e282cde0ab9da9cb8f5 Mon Sep 17 00:00:00 2001
From: Matt Pharr <matt.pharr@intel.com>
Date: Fri, 8 Jun 2012 13:33:11 -0700
Subject: [PATCH] Improve SourcePos reporting of the origin of the gather for
 gather warnings.

---
 expr.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/expr.cpp b/expr.cpp
index cc03ba20..5bc055fa 100644
--- a/expr.cpp
+++ b/expr.cpp
@@ -2639,9 +2639,10 @@ lEmitOpAssign(AssignExpr::Op op, Expr *arg0, Expr *arg1, const Type *type,
     // Get the value on the right-hand side of the assignment+operation
     // operator and load the current value on the left-hand side.
     llvm::Value *rvalue = arg1->GetValue(ctx);
-    ctx->SetDebugPos(pos);
     llvm::Value *mask = lMaskForSymbol(baseSym, ctx);
+    ctx->SetDebugPos(arg0->pos);
     llvm::Value *oldLHS = ctx->LoadInst(lv, mask, lvalueType);
+    ctx->SetDebugPos(pos);
 
     // Map the operator to the corresponding BinaryExpr::Op operator
     BinaryExpr::Op basicop;