aboutsummaryrefslogtreecommitdiff
path: root/src/main/stanza
diff options
context:
space:
mode:
authorjackbackrack2015-06-02 08:48:46 -0700
committerjackbackrack2015-06-02 08:48:46 -0700
commite4e6c8cb3e8876aa468497917ecff7ebfff567a4 (patch)
tree84dfcb57d974d7c44b9d7fce7ea7119980fea81f /src/main/stanza
parentb178ca42fd9d4f7b94d80c01cd810bf18da9ebc8 (diff)
turn off eliminate-temps until improved
Diffstat (limited to 'src/main/stanza')
-rw-r--r--src/main/stanza/compilers.stanza7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/stanza/compilers.stanza b/src/main/stanza/compilers.stanza
index 0c3978ab..67c6bfeb 100644
--- a/src/main/stanza/compilers.stanza
+++ b/src/main/stanza/compilers.stanza
@@ -41,13 +41,8 @@ public defstruct StandardVerilog <: Compiler :
file: String with: (as-method => true)
public defmethod passes (c:StandardVerilog) -> List<Pass> :
to-list $ [
-<<<<<<< HEAD
- CheckHighForm()
- ;; TempElimination()
-=======
CheckHighForm(expand-delin)
- TempElimination()
->>>>>>> upstream/master
+ ;; TempElimination()
ToWorkingIR()
MakeExplicitReset()
ResolveKinds()