From 32761a6cee1d0dee366b885b7b9c777e67885688 Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Sun, 10 Apr 2016 09:28:39 +0000
Subject: webkitgtk-2.4.11

---
 .../bytecode/BytecodeLivenessAnalysisInlines.h     | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysisInlines.h')

diff --git a/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysisInlines.h b/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysisInlines.h
index 9b5c755fc..8824bd85c 100644
--- a/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysisInlines.h
+++ b/Source/JavaScriptCore/bytecode/BytecodeLivenessAnalysisInlines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,26 +28,30 @@
 
 #include "BytecodeLivenessAnalysis.h"
 #include "CodeBlock.h"
-#include "Operations.h"
 
 namespace JSC {
 
-inline bool operandIsAlwaysLive(int operand)
+inline bool operandIsAlwaysLive(CodeBlock* codeBlock, int operand)
 {
-    return !VirtualRegister(operand).isLocal();
+    if (VirtualRegister(operand).isArgument())
+        return true;
+    return operand <= codeBlock->captureStart() && operand > codeBlock->captureEnd();
 }
 
-inline bool operandThatIsNotAlwaysLiveIsLive(const FastBitVector& out, int operand)
+inline bool operandThatIsNotAlwaysLiveIsLive(CodeBlock* codeBlock, const FastBitVector& out, int operand)
 {
-    unsigned local = VirtualRegister(operand).toLocal();
-    if (local >= out.numBits())
+    VirtualRegister virtualReg(operand);
+    if (virtualReg.offset() > codeBlock->captureStart())
+        return out.get(virtualReg.toLocal());
+    size_t index = virtualReg.toLocal() - codeBlock->captureCount();
+    if (index >= out.numBits())
         return false;
-    return out.get(local);
+    return out.get(index);
 }
 
-inline bool operandIsLive(const FastBitVector& out, int operand)
+inline bool operandIsLive(CodeBlock* codeBlock, const FastBitVector& out, int operand)
 {
-    return operandIsAlwaysLive(operand) || operandThatIsNotAlwaysLiveIsLive(out, operand);
+    return operandIsAlwaysLive(codeBlock, operand) || operandThatIsNotAlwaysLiveIsLive(codeBlock, out, operand);
 }
 
 } // namespace JSC
-- 
cgit v1.2.1