Decouple CodeGen from ErrorCode

sandbox/linux/seccomp-bpf/codegen.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 
 #include "base/logging.h"
 #include "sandbox/linux/seccomp-bpf/codegen.h"
 
 namespace {
@@ skipping 147 matching lines @@
     instructions_.push_back(insn);
     return insn;
   } else {
     // Non-jumping instructions do not use any of the branch targets.
     Instruction* insn = new Instruction(code, k, next);
     instructions_.push_back(insn);
     return insn;
   }
 }
 
-Instruction* CodeGen::MakeInstruction(uint16_t code, const ErrorCode& err) {
-  if (BPF_CLASS(code) != BPF_RET) {
-    SANDBOX_DIE("ErrorCodes can only be used in return expressions");
-  }
-  if (err.error_type_ != ErrorCode::ET_SIMPLE &&
-      err.error_type_ != ErrorCode::ET_TRAP) {
-    SANDBOX_DIE("ErrorCode is not suitable for returning from a BPF program");
-  }
-  return MakeInstruction(code, err.err_);
-}
-
 Instruction* CodeGen::MakeInstruction(uint16_t code,
                                       uint32_t k,
                                       Instruction* jt,
                                       Instruction* jf) {
   // We can handle all conditional jumps. They are followed by both a
   // "true" and a "false" branch.
   if (BPF_CLASS(code) != BPF_JMP || BPF_OP(code) == BPF_JA) {
     SANDBOX_DIE("Expected a BPF_JMP instruction");
   }
   if (!jt && !jf) {
@@ skipping 572 matching lines @@
       CutGraphIntoBasicBlocks(instructions, branch_targets, &all_blocks);
   MergeTails(&all_blocks);
   BasicBlocks basic_blocks;
   TopoSortBasicBlocks(first_block, all_blocks, &basic_blocks);
   ComputeRelativeJumps(&basic_blocks, all_blocks);
   ConcatenateBasicBlocks(basic_blocks, program);
   return;
 }
 
 }  // namespace sandbox