@@ -139,6 +139,56 @@ func TestContext2Plan_moduleCycle(t *testing.T) {
 	}
 }
 
+func TestContext2Plan_moduleDeadlock(t *testing.T) {
+	m := testModule(t, "plan-module-deadlock")
+	p := testProvider("aws")
+	p.DiffFn = testDiffFn
+	timeout := make(chan bool, 1)
+	done := make(chan bool, 1)
+	go func() {
+		time.Sleep(3 * time.Second)
+		timeout <- true
+	}()
+	go func() {
+		ctx := testContext2(t, &ContextOpts{
+			Module: m,
+			Providers: map[string]ResourceProviderFactory{
+				"aws": testProviderFuncFixed(p),
+			},
+		})
+
+		plan, err := ctx.Plan()
+		done <- true
+		if err != nil {
+			t.Fatalf("err: %s", err)
+		}
+
+		actual := strings.TrimSpace(plan.String())
+		expected := strings.TrimSpace(`
+DIFF:
+
+module.child:
+  CREATE: aws_instance.foo.0
+  CREATE: aws_instance.foo.1
+  CREATE: aws_instance.foo.2
+
+STATE:
+
+<no state>
+		`)
+		if actual != expected {
+			t.Fatalf("expected:\n%sgot:\n%s", expected, actual)
+		}
+	}()
+
+	select {
+	case <-timeout:
+		t.Fatalf("timed out! probably deadlock")
+	case <-done:
+		// ok
+	}
+}
+
 func TestContext2Plan_moduleInput(t *testing.T) {
 	m := testModule(t, "plan-module-input")
 	p := testProvider("aws")
 
@@ -311,13 +311,17 @@ func (n *GraphNodeConfigResourceFlat) DestroyNode(mode GraphNodeDestroyMode) Gra
 	return &graphNodeResourceDestroyFlat{
 		graphNodeResourceDestroy: node,
 		PathValue:                n.PathValue,
+		FlatCreateNode:           n,
 	}
 }
 
 type graphNodeResourceDestroyFlat struct {
 	*graphNodeResourceDestroy
 
 	PathValue []string
+
+	// Needs to be able to properly yield back a flattened create node to prevent
+	FlatCreateNode *GraphNodeConfigResourceFlat
 }
 
 func (n *graphNodeResourceDestroyFlat) Name() string {
@@ -329,6 +333,10 @@ func (n *graphNodeResourceDestroyFlat) Path() []string {
 	return n.PathValue
 }
 
+func (n *graphNodeResourceDestroyFlat) CreateNode() dag.Vertex {
+	return n.FlatCreateNode
+}
+
 // graphNodeResourceDestroy represents the logical destruction of a
 // resource. This node doesn't mean it will be destroyed for sure, but
 // instead that if a destroy were to happen, it must happen at this point.
 
@@ -0,0 +1,4 @@
+resource "aws_instance" "foo" {
+  count = "${length("abc")}"
+  lifecycle { create_before_destroy = true }
+}
@@ -0,0 +1,3 @@
+module "child" {
+  source = "./child"
+}
Original file line number	Diff line number	Diff line change
`@@ -311,13 +311,17 @@ func (n *GraphNodeConfigResourceFlat) DestroyNode(mode GraphNodeDestroyMode) Gra`
`311`	`311`	`return &graphNodeResourceDestroyFlat{`
`312`	`312`	`graphNodeResourceDestroy: node,`
`313`	`313`	`PathValue: n.PathValue,`
	`314`	`+ FlatCreateNode: n,`
`314`	`315`	`}`
`315`	`316`	`}`
`316`	`317`
`317`	`318`	`type graphNodeResourceDestroyFlat struct {`
`318`	`319`	`*graphNodeResourceDestroy`
`319`	`320`
`320`	`321`	`PathValue []string`
	`322`	`+`
	`323`	`+ // Needs to be able to properly yield back a flattened create node to prevent`
	`324`	`+ FlatCreateNode *GraphNodeConfigResourceFlat`
`321`	`325`	`}`
`322`	`326`
`323`	`327`	`func (n *graphNodeResourceDestroyFlat) Name() string {`
`@@ -329,6 +333,10 @@ func (n *graphNodeResourceDestroyFlat) Path() []string {`
`329`	`333`	`return n.PathValue`
`330`	`334`	`}`
`331`	`335`
	`336`	`+func (n *graphNodeResourceDestroyFlat) CreateNode() dag.Vertex {`
	`337`	`+ return n.FlatCreateNode`
	`338`	`+}`
	`339`	`+`
`332`	`340`	`// graphNodeResourceDestroy represents the logical destruction of a`
`333`	`341`	`// resource. This node doesn't mean it will be destroyed for sure, but`
`334`	`342`	`// instead that if a destroy were to happen, it must happen at this point.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module "child" {`
	`2`	`+ source = "./child"`
	`3`	`+}`