---

yaml
---
r: 263073
b: refs/heads/main
c: 2374654
h: refs/heads/main
i:
  263071: e3b67fb

Author: nex3

[refs]

@@ -1994,4 +1994,4 @@ refs/tags/2.14.0-96.0.dev: 1eee24e50fc3028754d9a8e98852b949c04da4e4
 refs/tags/2.14.0-97.0.dev: ba9c1636e87fbdcc02b8bc4a584455c32f8378b4
 refs/tags/2.14.0-98.0.dev: f2d370c93582bbf4da42b5dd4c906d6145b01ea9
 refs/tags/2.14.0-99.0.dev: e722f62b48fb382534efc1f20735def68848006f
-refs/heads/main: 5cb6cb0fa345d0f538811a65c2aaad69b34f7422
+refs/heads/main: 2374654f1fdffd404ca9dc595e698c62f72fea90

trunk/sdk/lib/core/future_impl.dart

@@ -235,7 +235,11 @@ class _FutureImpl<T> implements Future<T> {
           completer.complete(result);
         }
       } catch (innerException, stackTrace) {
-        completer.completeException(innerException, stackTrace);
+        if (identical(ex, innerException)) {
+          completer.completeException(innerException, this.stackTrace);
+        } else {
+          completer.completeException(innerException, stackTrace);
+        }
       }
       return false;
     });

trunk/tests/corelib/future_test.dart

@@ -351,6 +351,19 @@ testCallStackIsCapturedIfChainCallbackThrows() {
   Expect.isNotNull(chained.stackTrace);
 }
 
+testCallStackIsPreservedIfExceptionIsRethrownInTransformException() {
+  final completer = new Completer();
+  var chained = completer.future.chain((_) {
+    throw 'whoops!';
+  });
+  var transformed = chained.transformException((e) {
+    throw e;
+  });
+
+  completer.complete('blah');
+  Expect.equals(transformed.stackTrace, chained.stackTrace);
+}
+
 // Tests for mixed usage of [onComplete], [then], and [handleException]
 
 testCompleteWithCompletionAndSuccessHandlers() {
@@ -677,6 +690,7 @@ main() {
   testCallStackReturnsCallstackPassedToCompleteException();
   testCallStackIsCapturedIfTransformCallbackThrows();
   testCallStackIsCapturedIfChainCallbackThrows();
+  testCallStackIsPreservedIfExceptionIsRethrownInTransformException();
   testCompleteWithCompletionAndSuccessHandlers();
   testExceptionWithCompletionAndSuccessHandlers();
   testExceptionWithCompletionAndSuccessAndExceptionHandlers();