[commit: ghc] wip/hasfield: Resolve module import loop by adding a new boot file :-( (068f69b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/hasfield
Link       : http://ghc.haskell.org/trac/ghc/changeset/068f69b4021cd129e7398dfffa0073f06f802382/ghc

>---------------------------------------------------------------

commit 068f69b4021cd129e7398dfffa0073f06f802382
Author: Adam Gundry <adam at well-typed.com>
Date:   Wed Dec 23 11:52:23 2015 +0000

    Resolve module import loop by adding a new boot file :-(


>---------------------------------------------------------------

068f69b4021cd129e7398dfffa0073f06f802382
 compiler/hsSyn/PlaceHolder.hs                                         | 2 +-
 compiler/typecheck/TcEvidence.hs                                      | 2 +-
 .../drvrun015.stdout => compiler/typecheck/TcEvidence.hs-boot         | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/hsSyn/PlaceHolder.hs b/compiler/hsSyn/PlaceHolder.hs
index 8e3b9a3..a29d387 100644
--- a/compiler/hsSyn/PlaceHolder.hs
+++ b/compiler/hsSyn/PlaceHolder.hs
@@ -15,7 +15,7 @@ import RdrName
 import Var
 import Coercion
 import {-# SOURCE #-} ConLike (ConLike)
-import TcEvidence (HsWrapper)
+import {-# SOURCE #-} TcEvidence (HsWrapper)
 import FieldLabel
 import SrcLoc (Located)
 
diff --git a/compiler/typecheck/TcEvidence.hs b/compiler/typecheck/TcEvidence.hs
index e2ad4b8..ddac3e4 100644
--- a/compiler/typecheck/TcEvidence.hs
+++ b/compiler/typecheck/TcEvidence.hs
@@ -53,7 +53,7 @@ import VarEnv
 import VarSet
 import Name
 import Pair
-import HsExpr ( HsExpr )
+import {-# SOURCE #-} HsExpr ( HsExpr )
 
 import Util
 import Bag
diff --git a/testsuite/tests/deriving/should_run/drvrun015.stdout b/compiler/typecheck/TcEvidence.hs-boot
similarity index 60%
copy from testsuite/tests/deriving/should_run/drvrun015.stdout
copy to compiler/typecheck/TcEvidence.hs-boot
index d7059cd..48c3cbc 100644
--- a/testsuite/tests/deriving/should_run/drvrun015.stdout
+++ b/compiler/typecheck/TcEvidence.hs-boot
@@ -1 +1,3 @@
-"Obj {_id = 1, p1 = 10, p2 = 20}"
+module TcEvidence where
+
+data HsWrapper