@@ -2072,34 +2072,29 @@ public default int run(ThreadContext context, Data data, byte[] bytes, int start
     }
 
     /**
-     * Execute an interruptible regexp operation with the given function and bytess.
-     * @param context
-     * @param matcher
-     * @param start
-     * @param range
-     * @param option
-     * @param task
-     * @return ""
-     * @param <Data>
+     * Execute an interruptible {@link RegexMatch} with the given parameters.
+     * @param context the current context
+     * @param matcher the matcher with which to perform the matching operation
+     * @param start the start of the match
+     * @param range the range of the match
+     * @param option option for the match
+     * @param task the interruptible match task to call
+     * @return an int result of the match operation
      * @throws InterruptedException when interrupted
      */
-    public <Data> int executeRegexp(
+    public int executeRegexp(
             ThreadContext context,
             Matcher matcher, int start, int range, int option,
             RegexMatch task) throws InterruptedException {
-        Status oldStatus = STATUS.get(this);
         try {
             this.unblockArg = matcher;
             this.unblockFunc = task;
 
             // check for interrupt before going into blocking call
             blockingThreadPoll(context);
 
-            STATUS.set(this, Status.SLEEP);
-
             return task.run(matcher, start, range, option);
         } finally {
-            STATUS.set(this, oldStatus);
             this.unblockFunc = null;
             this.unblockArg = null;
             pollThreadEvents(context);
 
@@ -0,0 +1,40 @@
+require_relative '../../spec_helper'
+
+describe "Regexp matching" do
+  before :each do
+    ready = Queue.new
+    input = 'a' * 1000 + '!'
+    @thread = Thread.new do
+      ready << true
+      # The backreference prevents caching from eliminating the backtracking.
+      /\A(a|aa)+\1\z/.match(input)
+    rescue RuntimeError => error
+      error
+    end
+
+    ready.pop
+    sleep 0.01 # Allow the thread to enter the regexp match.
+  end
+
+  after :each do
+    @thread.kill
+    @thread.join
+  end
+
+  it "keeps the thread status as run during a long match" do
+    @thread.status.should == 'run'
+  end
+
+  it "can be interrupted by Thread#raise during a long match" do
+    @thread.raise RuntimeError, 'interrupted'
+    @thread.join(5).should == @thread
+    @thread.value.should.is_a?(RuntimeError)
+    @thread.value.message.should == 'interrupted'
+  end
+
+  it "can be interrupted by Thread#kill during a long match" do
+    @thread.kill
+    @thread.join(5).should == @thread
+    @thread.status.should == false
+  end
+end