From 4f28f0afe0d2696313683f772ca47c900a355943 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Wed, 10 Jun 2015 11:45:19 -0700
Subject: [PATCH 1/2] handle constexprs in fcmp
---
lib/Target/JSBackend/JSBackend.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/Target/JSBackend/JSBackend.cpp b/lib/Target/JSBackend/JSBackend.cpp
index 68ed2225661..6fda6cd5ba9 100644
--- a/lib/Target/JSBackend/JSBackend.cpp
+++ b/lib/Target/JSBackend/JSBackend.cpp
@@ -2096,8 +2096,11 @@ void JSWriter::generateExpression(const User *I, raw_string_ostream& Code) {
break;
}
case Instruction::FCmp: {
+ unsigned predicate = isa<ConstantExpr>(I) ?
+ cast<ConstantExpr>(I)->getPredicate() :
+ cast<FCmpInst>(I)->getPredicate();
Code << getAssignIfNeeded(I);
- switch (cast<FCmpInst>(I)->getPredicate()) {
+ switch (predicate) {
// Comparisons which are simple JS operators.
case FCmpInst::FCMP_OEQ: Code << getValueAsStr(I->getOperand(0)) << " == " << getValueAsStr(I->getOperand(1)); break;
case FCmpInst::FCMP_UNE: Code << getValueAsStr(I->getOperand(0)) << " != " << getValueAsStr(I->getOperand(1)); break;
From dccd6517fcc00126e4e74d77c5a8fa06efd3a2ad Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Tue, 16 Jun 2015 12:44:46 -0700
Subject: [PATCH 2/2] 1.34.0
---
emscripten-version.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emscripten-version.txt b/emscripten-version.txt
index fa911e3b71b..1368c976c81 100644
--- a/emscripten-version.txt
+++ b/emscripten-version.txt
@@ -1,2 +1,2 @@
-1.33.2
+1.34.0