---

yaml
---
r: 347167
b: refs/heads/master
c: 9b9ad4c
h: refs/heads/master
i:
  347165: f8e8ce3
  347163: c1e9ace
  347159: ebc6bf8
  347151: 1dfd753
  347135: a433ebe

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 052bc6721ab4c5de402e39458e5cd22f28dc3538
+refs/heads/master: 9b9ad4c4ceed9bad29e70ebfb852f9fa9c21ae01
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/TypeCheckExpr.cpp

@@ -217,6 +217,9 @@ TypeChecker::lookupPrecedenceGroupForInfixOperator(DeclContext *DC, Expr *E) {
 /// 'findLHS(DC, expr, '==')' returns nullptr.
 Expr *TypeChecker::findLHS(DeclContext *DC, Expr *E, Identifier name) {
   auto right = lookupPrecedenceGroupForOperator(*this, DC, name, E->getEndLoc());
+  if (!right)
+    return nullptr;
+
   while (true) {
 
     // Look through implicit conversions.

trunk/validation-test/IDE/crashers_2_fixed/rdar48648877.swift

@@ -0,0 +1,30 @@
+// RUN: %empty-directory(%t)
+// RUN: %{python} %utils/split_file.py -o %t %s
+// RUN: %target-swift-ide-test -code-completion -code-completion-token=COMPLETE -source-filename=%t/main.swift %t/a.swift %t/b.swift %t/c.swift %t/d.swift
+
+// BEGIN main.swift
+func foo(x: Int, y: Int) {
+  x + y #^COMPLETE^#
+}
+
+// BEGIN a.swift
+
+infix operator ***
+
+// BEGIN b.swift
+
+infix operator ***
+
+// BEGIN c.swift
+
+precedencegroup FooPrecedenceGroup {
+  higherThan: MultiplicationPrecedence
+}
+infix operator **** : FooPrecedenceGroup
+
+// BEGIN d.swift
+
+precedencegroup FooPrecedenceGroup {
+  higherThan: MultiplicationPrecedence
+}
+infix operator **** : FooPrecedenceGroup