Fix some tests that were broken by D861

I didn't realize that `./validate` does not run every test :(

Test Plan: ./validate --slow

Update submodule hpc.

Differential Revision: https://phabricator.haskell.org/D1204

4 files changed, 31 insertions, 29 deletions

diff --git a/libraries/hpc b/libraries/hpc
-Subproject a9ecba162ae307acf12a1a783dbe1cf6ebb5729
+Subproject da5928ccf4e369f6985ef291351d074918b8801
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index 7496958bb2..10abec47ea 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -1481,6 +1481,7 @@ mk/ghcconfig*_bin_ghc*.exe.mk
 /tests/typecheck/should_fail/tcfail149
 /tests/typecheck/should_run/Defer01
 /tests/typecheck/should_run/IPRun
+/tests/typecheck/should_run/IPLocation
 /tests/typecheck/should_run/T1624
 /tests/typecheck/should_run/T1735
 /tests/typecheck/should_run/T2722
diff --git a/testsuite/tests/typecheck/should_run/IPLocation.hs b/testsuite/tests/typecheck/should_run/IPLocation.hs
index ffc377b2c9..63f73d2ccb 100644
--- a/testsuite/tests/typecheck/should_run/IPLocation.hs
+++ b/testsuite/tests/typecheck/should_run/IPLocation.hs
@@ -2,7 +2,8 @@
 {-# OPTIONS_GHC -dcore-lint #-}
 module Main where
 
-import GHC.Stack
+import GHC.Exception
+import GHC.Types
 
 f0 = putStrLn $ showCallStack ?loc
      -- should just show the location of ?loc
diff --git a/testsuite/tests/typecheck/should_run/IPLocation.stdout b/testsuite/tests/typecheck/should_run/IPLocation.stdout
index 6dca7214d6..47de194981 100644
--- a/testsuite/tests/typecheck/should_run/IPLocation.stdout
+++ b/testsuite/tests/typecheck/should_run/IPLocation.stdout
@@ -1,28 +1,28 @@
-?loc, called at IPLocation.hs:7:31 in main:Main
-
-?loc, called at IPLocation.hs:11:31 in main:Main
-  f1, called at IPLocation.hs:39:11 in main:Main
-
-?loc, called at IPLocation.hs:15:34 in main:Main
-  f2, called at IPLocation.hs:40:11 in main:Main
-
-?loc, called at IPLocation.hs:16:34 in main:Main
-  f2, called at IPLocation.hs:40:11 in main:Main
-
-?loc, called at IPLocation.hs:41:48 in main:Main
-  x, called at IPLocation.hs:21:8 in main:Main
-
-?loc, called at IPLocation.hs:42:48 in main:Main
-  x, called at IPLocation.hs:26:8 in main:Main
-  f4, called at IPLocation.hs:42:11 in main:Main
-
-?loc3, called at IPLocation.hs:43:48 in main:Main
-
-?loc, called at IPLocation.hs:34:33 in main:Main
-  f6, called at IPLocation.hs:35:8 in main:Main
-  f6, called at IPLocation.hs:35:8 in main:Main
-  f6, called at IPLocation.hs:35:8 in main:Main
-  f6, called at IPLocation.hs:35:8 in main:Main
-  f6, called at IPLocation.hs:35:8 in main:Main
-  f6, called at IPLocation.hs:44:11 in main:Main
-
+CallStack:
+  ?loc, called at IPLocation.hs:8:31 in main:Main
+CallStack:
+  ?loc, called at IPLocation.hs:12:31 in main:Main
+  f1, called at IPLocation.hs:40:11 in main:Main
+CallStack:
+  ?loc, called at IPLocation.hs:16:34 in main:Main
+  f2, called at IPLocation.hs:41:11 in main:Main
+CallStack:
+  ?loc, called at IPLocation.hs:17:34 in main:Main
+  f2, called at IPLocation.hs:41:11 in main:Main
+CallStack:
+  ?loc, called at IPLocation.hs:42:48 in main:Main
+  x, called at IPLocation.hs:22:8 in main:Main
+CallStack:
+  ?loc, called at IPLocation.hs:43:48 in main:Main
+  x, called at IPLocation.hs:27:8 in main:Main
+  f4, called at IPLocation.hs:43:11 in main:Main
+CallStack:
+  ?loc3, called at IPLocation.hs:44:48 in main:Main
+CallStack:
+  ?loc, called at IPLocation.hs:35:33 in main:Main
+  f6, called at IPLocation.hs:36:8 in main:Main
+  f6, called at IPLocation.hs:36:8 in main:Main
+  f6, called at IPLocation.hs:36:8 in main:Main
+  f6, called at IPLocation.hs:36:8 in main:Main
+  f6, called at IPLocation.hs:36:8 in main:Main
+  f6, called at IPLocation.hs:45:11 in main:Main